Page MenuHomeFreeBSD
Files F171668732

D16025.id44486.diff
No OneTemporary
Actions

D16025.id44486.diff
View Options

Index: contrib/ntp/util/tg.c
===================================================================
--- contrib/ntp/util/tg.c
+++ contrib/ntp/util/tg.c
@@ -583,7 +583,7 @@
* 100 Hz corresponding to 0, 1 or position indicator (PI),
* respectively. Note the 100-Hz data pulses are transmitted 6
* dB below the 1000-Hz sync pulses. Originally the data pulses
- * were transmited 10 dB below the sync pulses, but the station
+ * were transmitted 10 dB below the sync pulses, but the station
* engineers increased that to 6 dB because the Heath GC-1000
* WWV/H radio clock worked much better.
*/
Index: contrib/ntp/util/tg2.c
===================================================================
--- contrib/ntp/util/tg2.c
+++ contrib/ntp/util/tg2.c
@@ -2202,7 +2202,7 @@
* 100 Hz corresponding to 0, 1 or position indicator (PI),
* respectively. Note the 100-Hz data pulses are transmitted 6
* dB below the 1000-Hz sync pulses. Originally the data pulses
- * were transmited 10 dB below the sync pulses, but the station
+ * were transmitted 10 dB below the sync pulses, but the station
* engineers increased that to 6 dB because the Heath GC-1000
* WWV/H radio clock worked much better.
*/
Index: contrib/ofed/opensm/man/opensm.8
===================================================================
--- contrib/ofed/opensm/man/opensm.8
+++ contrib/ofed/opensm/man/opensm.8
@@ -1323,7 +1323,7 @@
available SL or virtual lanes
.br
a.2) applications must perform a path record query to get path SL for
-each route, which the application will use to transmite packages
+each route, which the application will use to transmit packages
.br
b) running SSSP: '-R sssp'
.br
Index: sys/contrib/alpine-hal/al_hal_pcie.c
===================================================================
--- sys/contrib/alpine-hal/al_hal_pcie.c
+++ sys/contrib/alpine-hal/al_hal_pcie.c
@@ -2488,7 +2488,7 @@
* Bug in SNPS IP (versions 4.21 , 4.10a-ea02)
* In CFG request created via outbound atu (shift mode) bits [27:12] go to
* [31:16] , the shifting is correct , however the ATU leaves bit [15:12]
- * to their original values, this is then transmited in the tlp .
+ * to their original values, this is then transmitted in the tlp .
* Those bits are currently reserved ,bit might be non-resv. in future generations .
*
* Software flow:
Index: sys/contrib/octeon-sdk/cvmx-agl-defs.h
===================================================================
--- sys/contrib/octeon-sdk/cvmx-agl-defs.h
+++ sys/contrib/octeon-sdk/cvmx-agl-defs.h
@@ -4388,11 +4388,11 @@
uint64_t ifg2 : 4; /**< 1/3 of the interframe gap timing
If CRS is detected during IFG2, then the
interFrameSpacing timer is not reset and a frame
- is transmited once the timer expires. */
+ is transmitted once the timer expires. */
uint64_t ifg1 : 4; /**< 2/3 of the interframe gap timing
If CRS is detected during IFG1, then the
interFrameSpacing timer is reset and a frame is
- not transmited. */
+ not transmitted. */
#else
uint64_t ifg1 : 4;
uint64_t ifg2 : 4;
Index: sys/contrib/octeon-sdk/cvmx-asxx-defs.h
===================================================================
--- sys/contrib/octeon-sdk/cvmx-asxx-defs.h
+++ sys/contrib/octeon-sdk/cvmx-asxx-defs.h
@@ -1103,7 +1103,7 @@
*
* Notes:
* Setting to place on the open-loop TXC (RGMII transmit clk)
- * delay line, which can delay the transmited clock. This
+ * delay line, which can delay the transmitted clock. This
* can be used if the board and/or transmitting device
* has not otherwise delayed the clock.
*
Index: sys/contrib/octeon-sdk/cvmx-gmxx-defs.h
===================================================================
--- sys/contrib/octeon-sdk/cvmx-gmxx-defs.h
+++ sys/contrib/octeon-sdk/cvmx-gmxx-defs.h
@@ -9422,11 +9422,11 @@
uint64_t ifg2 : 4; /**< 1/3 of the interframe gap timing (in IFG2*8 bits)
If CRS is detected during IFG2, then the
interFrameSpacing timer is not reset and a frame
- is transmited once the timer expires. */
+ is transmitted once the timer expires. */
uint64_t ifg1 : 4; /**< 2/3 of the interframe gap timing (in IFG1*8 bits)
If CRS is detected during IFG1, then the
interFrameSpacing timer is reset and a frame is
- not transmited. */
+ not transmitted. */
#else
uint64_t ifg1 : 4;
uint64_t ifg2 : 4;
Index: sys/dev/cx/cxddk.c
===================================================================
--- sys/dev/cx/cxddk.c
+++ sys/dev/cx/cxddk.c
@@ -215,7 +215,7 @@
}
/*
- * Turn the transmiter on/off.
+ * Turn the transmitter on/off.
*/
void cx_enable_transmit (cx_chan_t *c, int on)
{
Index: sys/dev/drm2/radeon/atombios.h
===================================================================
--- sys/dev/drm2/radeon/atombios.h
+++ sys/dev/drm2/radeon/atombios.h
@@ -1055,7 +1055,7 @@
ATOM_DP_VS_MODE asMode; // DP Voltage swing mode
};
ATOM_DIG_TRANSMITTER_CONFIG_V2 acConfig;
- UCHAR ucAction; // define as ATOM_TRANSMITER_ACTION_XXX
+ UCHAR ucAction; // define as ATOM_TRANSMITTER_ACTION_XXX
UCHAR ucReserved[4];
}DIG_TRANSMITTER_CONTROL_PARAMETERS_V2;
@@ -1094,7 +1094,7 @@
ATOM_DP_VS_MODE asMode; // DP Voltage swing mode
};
ATOM_DIG_TRANSMITTER_CONFIG_V3 acConfig;
- UCHAR ucAction; // define as ATOM_TRANSMITER_ACTION_XXX
+ UCHAR ucAction; // define as ATOM_TRANSMITTER_ACTION_XXX
UCHAR ucLaneNum;
UCHAR ucReserved[3];
}DIG_TRANSMITTER_CONTROL_PARAMETERS_V3;
@@ -1193,7 +1193,7 @@
ATOM_DIG_TRANSMITTER_CONFIG_V4 acConfig;
UCHAR ucConfig;
};
- UCHAR ucAction; // define as ATOM_TRANSMITER_ACTION_XXX
+ UCHAR ucAction; // define as ATOM_TRANSMITTER_ACTION_XXX
UCHAR ucLaneNum;
UCHAR ucReserved[3];
}DIG_TRANSMITTER_CONTROL_PARAMETERS_V4;
@@ -1245,7 +1245,7 @@
{
USHORT usSymClock; // Encoder Clock in 10kHz,(DP mode)= linkclock/10, (TMDS/LVDS/HDMI)= pixel clock, (HDMI deep color), =pixel clock * deep_color_ratio
UCHAR ucPhyId; // 0=UNIPHYA, 1=UNIPHYB, 2=UNIPHYC, 3=UNIPHYD, 4= UNIPHYE 5=UNIPHYF
- UCHAR ucAction; // define as ATOM_TRANSMITER_ACTION_xxx
+ UCHAR ucAction; // define as ATOM_TRANSMITTER_ACTION_xxx
UCHAR ucLaneNum; // indicate lane number 1-8
UCHAR ucConnObjId; // Connector Object Id defined in ObjectId.h
UCHAR ucDigMode; // indicate DIG mode
Index: sys/dev/ixgbe/ixgbe_phy.h
===================================================================
--- sys/dev/ixgbe/ixgbe_phy.h
+++ sys/dev/ixgbe/ixgbe_phy.h
@@ -81,7 +81,8 @@
#define IXGBE_SFF_QSFP_DA_ACTIVE_CABLE 0x1
#define IXGBE_SFF_QSFP_DA_PASSIVE_CABLE 0x8
#define IXGBE_SFF_QSFP_CONNECTOR_NOT_SEPARABLE 0x23
-#define IXGBE_SFF_QSFP_TRANSMITER_850NM_VCSEL 0x0
+#define IXGBE_SFF_QSFP_TRANSMITTER_850NM_VCSEL 0x0
+#define IXGBE_SFF_QSFP_TRANSMITER_850NM_VCSEL IXGBE_SFF_QSFP_TRANSMITTER_850NM_VCSEL
#define IXGBE_I2C_EEPROM_READ_MASK 0x100
#define IXGBE_I2C_EEPROM_STATUS_MASK 0x3
#define IXGBE_I2C_EEPROM_STATUS_NO_OPERATION 0x0
Index: sys/dev/ixgbe/ixgbe_phy.c
===================================================================
--- sys/dev/ixgbe/ixgbe_phy.c
+++ sys/dev/ixgbe/ixgbe_phy.c
@@ -1726,7 +1726,7 @@
IXGBE_SFF_QSFP_CONNECTOR_NOT_SEPARABLE) &&
(cable_length > 0) &&
((device_tech >> 4) ==
- IXGBE_SFF_QSFP_TRANSMITER_850NM_VCSEL))
+ IXGBE_SFF_QSFP_TRANSMITTER_850NM_VCSEL))
active_cable = TRUE;
}
Index: sys/dev/qlnx/qlnxe/common_hsi.h
===================================================================
--- sys/dev/qlnx/qlnxe/common_hsi.h
+++ sys/dev/qlnx/qlnxe/common_hsi.h
@@ -1391,8 +1391,10 @@
__le16 state;
#define RDIF_TASK_CONTEXT_RECEIVEDDIFBYTESLEFT_MASK 0xF
#define RDIF_TASK_CONTEXT_RECEIVEDDIFBYTESLEFT_SHIFT 0
-#define RDIF_TASK_CONTEXT_TRANSMITEDDIFBYTESLEFT_MASK 0xF
-#define RDIF_TASK_CONTEXT_TRANSMITEDDIFBYTESLEFT_SHIFT 4
+#define RDIF_TASK_CONTEXT_TRANSMITTEDDIFBYTESLEFT_MASK 0xF
+#define RDIF_TASK_CONTEXT_TRANSMITEDDIFBYTESLEFT_MASK RDIF_TASK_CONTEXT_TRANSMITTEDDIFBYTESLEFT_MASK
+#define RDIF_TASK_CONTEXT_TRANSMITTEDDIFBYTESLEFT_SHIFT 4
+#define RDIF_TASK_CONTEXT_TRANSMITEDDIFBYTESLEFT_SHIFT RDIF_TASK_CONTEXT_TRANSMITTEDDIFBYTESLEFT_SHIFT
#define RDIF_TASK_CONTEXT_ERRORINIO_MASK 0x1
#define RDIF_TASK_CONTEXT_ERRORINIO_SHIFT 8
#define RDIF_TASK_CONTEXT_CHECKSUMOVERFLOW_MASK 0x1
@@ -1477,8 +1479,10 @@
__le16 stateB;
#define TDIF_TASK_CONTEXT_RECEIVEDDIFBYTESLEFTB_MASK 0xF
#define TDIF_TASK_CONTEXT_RECEIVEDDIFBYTESLEFTB_SHIFT 0
-#define TDIF_TASK_CONTEXT_TRANSMITEDDIFBYTESLEFTB_MASK 0xF
-#define TDIF_TASK_CONTEXT_TRANSMITEDDIFBYTESLEFTB_SHIFT 4
+#define TDIF_TASK_CONTEXT_TRANSMITTEDDIFBYTESLEFTB_MASK 0xF
+#define TDIF_TASK_CONTEXT_TRANSMITEDDIFBYTESLEFTB_MASK TDIF_TASK_CONTEXT_TRANSMITTEDDIFBYTESLEFTB_MASK
+#define TDIF_TASK_CONTEXT_TRANSMITTEDDIFBYTESLEFTB_SHIFT 4
+#define TDIF_TASK_CONTEXT_TRANSMITEDDIFBYTESLEFTB_SHIFT TDIF_TASK_CONTEXT_TRANSMITTEDDIFBYTESLEFTB_SHIFT
#define TDIF_TASK_CONTEXT_ERRORINIOB_MASK 0x1
#define TDIF_TASK_CONTEXT_ERRORINIOB_SHIFT 8
#define TDIF_TASK_CONTEXT_CHECKSUMOVERFLOW_MASK 0x1
@@ -1526,8 +1530,10 @@
#define TDIF_TASK_CONTEXT_NETWORKINTERFACE_SHIFT 13
#define TDIF_TASK_CONTEXT_RECEIVEDDIFBYTESLEFTA_MASK 0xF
#define TDIF_TASK_CONTEXT_RECEIVEDDIFBYTESLEFTA_SHIFT 14
-#define TDIF_TASK_CONTEXT_TRANSMITEDDIFBYTESLEFTA_MASK 0xF
-#define TDIF_TASK_CONTEXT_TRANSMITEDDIFBYTESLEFTA_SHIFT 18
+#define TDIF_TASK_CONTEXT_TRANSMITTEDDIFBYTESLEFTA_MASK 0xF
+#define TDIF_TASK_CONTEXT_TRANSMITTEDDIFBYTESLEFTA_SHIFT 18
+#define TDIF_TASK_CONTEXT_TRANSMITEDDIFBYTESLEFTA_MASK TDIF_TASK_CONTEXT_TRANSMITTEDDIFBYTESLEFTA_MASK
+#define TDIF_TASK_CONTEXT_TRANSMITEDDIFBYTESLEFTA_SHIFT TDIF_TASK_CONTEXT_TRANSMITTEDDIFBYTESLEFTA_SHIFT
#define TDIF_TASK_CONTEXT_ERRORINIOA_MASK 0x1
#define TDIF_TASK_CONTEXT_ERRORINIOA_SHIFT 22
#define TDIF_TASK_CONTEXT_CHECKSUMOVERFLOWA_MASK 0x1
Index: sys/dev/qlnx/qlnxe/qlnx_os.c
===================================================================
--- sys/dev/qlnx/qlnxe/qlnx_os.c
+++ sys/dev/qlnx/qlnxe/qlnx_os.c
@@ -1262,7 +1262,7 @@
SYSCTL_ADD_QUAD(ctx, node_children,
OID_AUTO, "tx_non_tso_pkts",
CTLFLAG_RD, &ha->fp_array[i].tx_non_tso_pkts,
- "No. of non LSO transmited packets");
+ "No. of non LSO transmitted packets");
#ifdef QLNX_TRACE_PERF_DATA
@@ -1295,7 +1295,7 @@
SYSCTL_ADD_QUAD(ctx, node_children,
OID_AUTO, "tx_tso_pkts",
CTLFLAG_RD, &ha->fp_array[i].tx_tso_pkts,
- "No. of LSO transmited packets");
+ "No. of LSO transmitted packets");
SYSCTL_ADD_QUAD(ctx, node_children,
OID_AUTO, "tx_lso_wnd_min_len",
Index: sys/dev/qlnx/qlnxe/reg_addr.h
===================================================================
--- sys/dev/qlnx/qlnxe/reg_addr.h
+++ sys/dev/qlnx/qlnxe/reg_addr.h
@@ -40547,10 +40547,10 @@
#define XMAC_REG_TX_CTRL_LO_AVERAGE_IPG_BB_SHIFT 12
#define XMAC_REG_TX_CTRL_LO_THROT_NUM_BB (0x3f<<19) // Number of bytes of extra IPG added whenever txThrotDemon bytes have been transmitted.
#define XMAC_REG_TX_CTRL_LO_THROT_NUM_BB_SHIFT 19
- #define XMAC_REG_TX_CTRL_LO_THROT_DENOM_LO_BB (0x7f<<25) // Lower 8 bits of throt_denom register. Number of bytes to transmite before adding txThrotNumer bytes to the IPG.
+ #define XMAC_REG_TX_CTRL_LO_THROT_DENOM_LO_BB (0x7f<<25) // Lower 8 bits of throt_denom register. Number of bytes to transmit before adding txThrotNumer bytes to the IPG.
#define XMAC_REG_TX_CTRL_LO_THROT_DENOM_LO_BB_SHIFT 25
#define XMAC_REG_TX_CTRL_HI_BB 0x210024UL //Access:RW DataWidth:0x6 // Multi Field Register.
- #define XMAC_REG_TX_CTRL_HI_THROT_DENOM_HI_BB (0x1<<0) // Upper 8 bits of throt_denom register. Number of bytes to transmite before adding txThrotNumer bytes to the IPG.
+ #define XMAC_REG_TX_CTRL_HI_THROT_DENOM_HI_BB (0x1<<0) // Upper 8 bits of throt_denom register. Number of bytes to transmit before adding txThrotNumer bytes to the IPG.
#define XMAC_REG_TX_CTRL_HI_THROT_DENOM_HI_BB_SHIFT 0
#define XMAC_REG_TX_CTRL_HI_TX_PREAMBLE_LENGTH_BB (0xf<<1) // Number of preamble bytes for transmit IEEE packets; this value should include the K.SOP & SFD character as well.
#define XMAC_REG_TX_CTRL_HI_TX_PREAMBLE_LENGTH_BB_SHIFT 1
Index: sys/i386/include/cserial.h
===================================================================
--- sys/i386/include/cserial.h
+++ sys/i386/include/cserial.h
@@ -89,7 +89,7 @@
#define ER_SCC_FRAMING 7 /* subchannel framing error */
#define ER_SCC_OVERFLOW 8 /* subchannel receive buffer overflow */
#define ER_SCC_OVERRUN 9 /* subchannel receiver overrun */
-#define ER_SCC_UNDERRUN 10 /* subchannel transmiter underrun */
+#define ER_SCC_UNDERRUN 10 /* subchannel transmitter underrun */
#define ER_BUS 11 /* system bus is too busy (e.g PCI) */
/*
Index: sys/net80211/ieee80211_hwmp.c
===================================================================
--- sys/net80211/ieee80211_hwmp.c
+++ sys/net80211/ieee80211_hwmp.c
@@ -920,7 +920,7 @@
rttran->rt_metric > metric)
{
IEEE80211_NOTE(vap, IEEE80211_MSG_HWMP, ni,
- "%s path to transmiter %6D of %s, metric %d:%d",
+ "%s path to transmitter %6D of %s, metric %d:%d",
rttran->rt_flags & IEEE80211_MESHRT_FLAGS_VALID ?
"prefer" : "update", ni->ni_macaddr, ":", hwmp_frame,
rttran->rt_metric, metric);
Index: sys/netinet/sctp_indata.c
===================================================================
--- sys/netinet/sctp_indata.c
+++ sys/netinet/sctp_indata.c
@@ -3073,7 +3073,7 @@
tp1->whoTo->net_ack += tp1->send_size;
if (tp1->snd_count < 2) {
/*-
- * True non-retransmited chunk
+ * True non-retransmitted chunk
*/
tp1->whoTo->net_ack2 += tp1->send_size;
@@ -4046,7 +4046,7 @@
tp1->whoTo->net_ack += tp1->send_size;
if (tp1->snd_count < 2) {
/*
- * True non-retransmited
+ * True non-retransmitted
* chunk
*/
tp1->whoTo->net_ack2 +=
@@ -4662,7 +4662,7 @@
if (tp1->snd_count < 2) {
/*
- * True non-retransmited
+ * True non-retransmitted
* chunk
*/
tp1->whoTo->net_ack2 +=

File Metadata

Mime Type
text/plain
Expires
Sun, Sep 13, 1:42 PM (5 h, 3 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
38808137
Default Alt Text
D16025.id44486.diff (16 KB)

Event Timeline