diff options
Diffstat (limited to 'drivers/net')
48 files changed, 76 insertions, 71 deletions
diff --git a/drivers/net/82596.c b/drivers/net/82596.c index ea6b139b812c..1663bc9e45de 100644 --- a/drivers/net/82596.c +++ b/drivers/net/82596.c | |||
@@ -19,7 +19,7 @@ | |||
19 | TBD: | 19 | TBD: |
20 | * look at deferring rx frames rather than discarding (as per tulip) | 20 | * look at deferring rx frames rather than discarding (as per tulip) |
21 | * handle tx ring full as per tulip | 21 | * handle tx ring full as per tulip |
22 | * performace test to tune rx_copybreak | 22 | * performance test to tune rx_copybreak |
23 | 23 | ||
24 | Most of my modifications relate to the braindead big-endian | 24 | Most of my modifications relate to the braindead big-endian |
25 | implementation by Intel. When the i596 is operating in | 25 | implementation by Intel. When the i596 is operating in |
diff --git a/drivers/net/amd8111e.c b/drivers/net/amd8111e.c index 4e6359fff0e1..766aabfdfc75 100644 --- a/drivers/net/amd8111e.c +++ b/drivers/net/amd8111e.c | |||
@@ -1633,8 +1633,13 @@ static int amd8111e_enable_link_change(struct amd8111e_priv* lp) | |||
1633 | readl(lp->mmio + CMD7); | 1633 | readl(lp->mmio + CMD7); |
1634 | return 0; | 1634 | return 0; |
1635 | } | 1635 | } |
1636 | /* This function is called when a packet transmission fails to complete within a resonable period, on the assumption that an interrupts have been failed or the interface is locked up. This function will reinitialize the hardware */ | ||
1637 | 1636 | ||
1637 | /* | ||
1638 | * This function is called when a packet transmission fails to complete | ||
1639 | * within a reasonable period, on the assumption that an interrupt have | ||
1640 | * failed or the interface is locked up. This function will reinitialize | ||
1641 | * the hardware. | ||
1642 | */ | ||
1638 | static void amd8111e_tx_timeout(struct net_device *dev) | 1643 | static void amd8111e_tx_timeout(struct net_device *dev) |
1639 | { | 1644 | { |
1640 | struct amd8111e_priv* lp = netdev_priv(dev); | 1645 | struct amd8111e_priv* lp = netdev_priv(dev); |
diff --git a/drivers/net/appletalk/cops.c b/drivers/net/appletalk/cops.c index b5dc7f550725..9d828aed968a 100644 --- a/drivers/net/appletalk/cops.c +++ b/drivers/net/appletalk/cops.c | |||
@@ -120,7 +120,7 @@ static int irq = 5; /* Default IRQ */ | |||
120 | * DAYNA driver mode: | 120 | * DAYNA driver mode: |
121 | * Dayna DL2000/DaynaTalk PC (Half Length), COPS LT-95, | 121 | * Dayna DL2000/DaynaTalk PC (Half Length), COPS LT-95, |
122 | * Farallon PhoneNET PC III, Farallon PhoneNET PC II | 122 | * Farallon PhoneNET PC III, Farallon PhoneNET PC II |
123 | * Other cards possibly supported mode unkown though: | 123 | * Other cards possibly supported mode unknown though: |
124 | * Dayna DL2000 (Full length), COPS LT/M (Micro-Channel) | 124 | * Dayna DL2000 (Full length), COPS LT/M (Micro-Channel) |
125 | * | 125 | * |
126 | * Cards NOT supported by this driver but supported by the ltpc.c | 126 | * Cards NOT supported by this driver but supported by the ltpc.c |
diff --git a/drivers/net/ariadne.h b/drivers/net/ariadne.h index bb613f292e04..727be5cdd1ea 100644 --- a/drivers/net/ariadne.h +++ b/drivers/net/ariadne.h | |||
@@ -244,7 +244,7 @@ struct Am79C960 { | |||
244 | #define DLNKTST 0x0010 /* Disable Link Status */ | 244 | #define DLNKTST 0x0010 /* Disable Link Status */ |
245 | #define DAPC 0x0008 /* Disable Automatic Polarity Correction */ | 245 | #define DAPC 0x0008 /* Disable Automatic Polarity Correction */ |
246 | #define MENDECL 0x0004 /* MENDEC Loopback Mode */ | 246 | #define MENDECL 0x0004 /* MENDEC Loopback Mode */ |
247 | #define LRTTSEL 0x0002 /* Low Receive Treshold/Transmit Mode Select */ | 247 | #define LRTTSEL 0x0002 /* Low Receive Threshold/Transmit Mode Select */ |
248 | #define PORTSEL1 0x0001 /* Port Select Bits */ | 248 | #define PORTSEL1 0x0001 /* Port Select Bits */ |
249 | #define PORTSEL2 0x8000 /* Port Select Bits */ | 249 | #define PORTSEL2 0x8000 /* Port Select Bits */ |
250 | #define INTL 0x4000 /* Internal Loopback */ | 250 | #define INTL 0x4000 /* Internal Loopback */ |
diff --git a/drivers/net/atl1c/atl1c_main.c b/drivers/net/atl1c/atl1c_main.c index 1372e9a99f5b..96506eacc131 100644 --- a/drivers/net/atl1c/atl1c_main.c +++ b/drivers/net/atl1c/atl1c_main.c | |||
@@ -1543,7 +1543,7 @@ static irqreturn_t atl1c_intr(int irq, void *data) | |||
1543 | if (status & ISR_OVER) | 1543 | if (status & ISR_OVER) |
1544 | if (netif_msg_intr(adapter)) | 1544 | if (netif_msg_intr(adapter)) |
1545 | dev_warn(&pdev->dev, | 1545 | dev_warn(&pdev->dev, |
1546 | "TX/RX over flow (status = 0x%x)\n", | 1546 | "TX/RX overflow (status = 0x%x)\n", |
1547 | status & ISR_OVER); | 1547 | status & ISR_OVER); |
1548 | 1548 | ||
1549 | /* link event */ | 1549 | /* link event */ |
diff --git a/drivers/net/benet/be_cmds.h b/drivers/net/benet/be_cmds.h index 49953787e41c..f0bb62b5ca9e 100644 --- a/drivers/net/benet/be_cmds.h +++ b/drivers/net/benet/be_cmds.h | |||
@@ -435,7 +435,7 @@ enum be_if_flags { | |||
435 | * filtering capabilities. */ | 435 | * filtering capabilities. */ |
436 | struct be_cmd_req_if_create { | 436 | struct be_cmd_req_if_create { |
437 | struct be_cmd_req_hdr hdr; | 437 | struct be_cmd_req_hdr hdr; |
438 | u32 version; /* ignore currntly */ | 438 | u32 version; /* ignore currently */ |
439 | u32 capability_flags; | 439 | u32 capability_flags; |
440 | u32 enable_flags; | 440 | u32 enable_flags; |
441 | u8 mac_addr[ETH_ALEN]; | 441 | u8 mac_addr[ETH_ALEN]; |
diff --git a/drivers/net/benet/be_main.c b/drivers/net/benet/be_main.c index 1f941f027718..02a0908707ed 100644 --- a/drivers/net/benet/be_main.c +++ b/drivers/net/benet/be_main.c | |||
@@ -1876,7 +1876,7 @@ int be_load_fw(struct be_adapter *adapter, u8 *func) | |||
1876 | goto fw_exit; | 1876 | goto fw_exit; |
1877 | } | 1877 | } |
1878 | 1878 | ||
1879 | dev_info(&adapter->pdev->dev, "Firmware flashed succesfully\n"); | 1879 | dev_info(&adapter->pdev->dev, "Firmware flashed successfully\n"); |
1880 | 1880 | ||
1881 | fw_exit: | 1881 | fw_exit: |
1882 | release_firmware(fw); | 1882 | release_firmware(fw); |
diff --git a/drivers/net/bnx2x_reg.h b/drivers/net/bnx2x_reg.h index aa76cbada5e2..732eafdeb0f2 100644 --- a/drivers/net/bnx2x_reg.h +++ b/drivers/net/bnx2x_reg.h | |||
@@ -2536,7 +2536,7 @@ | |||
2536 | /* [RC 1] A flag to indicate that overflow error occurred in one of the | 2536 | /* [RC 1] A flag to indicate that overflow error occurred in one of the |
2537 | queues. */ | 2537 | queues. */ |
2538 | #define QM_REG_OVFERROR 0x16805c | 2538 | #define QM_REG_OVFERROR 0x16805c |
2539 | /* [RC 7] the Q were the qverflow occurs */ | 2539 | /* [RC 7] the Q where the overflow occurs */ |
2540 | #define QM_REG_OVFQNUM 0x168058 | 2540 | #define QM_REG_OVFQNUM 0x168058 |
2541 | /* [R 16] Pause state for physical queues 15-0 */ | 2541 | /* [R 16] Pause state for physical queues 15-0 */ |
2542 | #define QM_REG_PAUSESTATE0 0x168410 | 2542 | #define QM_REG_PAUSESTATE0 0x168410 |
diff --git a/drivers/net/cxgb3/sge.c b/drivers/net/cxgb3/sge.c index f86612857a73..56ba872be9c1 100644 --- a/drivers/net/cxgb3/sge.c +++ b/drivers/net/cxgb3/sge.c | |||
@@ -1285,7 +1285,7 @@ netdev_tx_t t3_eth_xmit(struct sk_buff *skb, struct net_device *dev) | |||
1285 | 1285 | ||
1286 | /* | 1286 | /* |
1287 | * We do not use Tx completion interrupts to free DMAd Tx packets. | 1287 | * We do not use Tx completion interrupts to free DMAd Tx packets. |
1288 | * This is good for performamce but means that we rely on new Tx | 1288 | * This is good for performance but means that we rely on new Tx |
1289 | * packets arriving to run the destructors of completed packets, | 1289 | * packets arriving to run the destructors of completed packets, |
1290 | * which open up space in their sockets' send queues. Sometimes | 1290 | * which open up space in their sockets' send queues. Sometimes |
1291 | * we do not get such new packets causing Tx to stall. A single | 1291 | * we do not get such new packets causing Tx to stall. A single |
diff --git a/drivers/net/ehea/ehea_ethtool.c b/drivers/net/ehea/ehea_ethtool.c index d76885223366..75b099ce49c9 100644 --- a/drivers/net/ehea/ehea_ethtool.c +++ b/drivers/net/ehea/ehea_ethtool.c | |||
@@ -118,7 +118,7 @@ doit: | |||
118 | ret = ehea_set_portspeed(port, sp); | 118 | ret = ehea_set_portspeed(port, sp); |
119 | 119 | ||
120 | if (!ret) | 120 | if (!ret) |
121 | ehea_info("%s: Port speed succesfully set: %dMbps " | 121 | ehea_info("%s: Port speed successfully set: %dMbps " |
122 | "%s Duplex", | 122 | "%s Duplex", |
123 | port->netdev->name, port->port_speed, | 123 | port->netdev->name, port->port_speed, |
124 | port->full_duplex == 1 ? "Full" : "Half"); | 124 | port->full_duplex == 1 ? "Full" : "Half"); |
@@ -134,7 +134,7 @@ static int ehea_nway_reset(struct net_device *dev) | |||
134 | ret = ehea_set_portspeed(port, EHEA_SPEED_AUTONEG); | 134 | ret = ehea_set_portspeed(port, EHEA_SPEED_AUTONEG); |
135 | 135 | ||
136 | if (!ret) | 136 | if (!ret) |
137 | ehea_info("%s: Port speed succesfully set: %dMbps " | 137 | ehea_info("%s: Port speed successfully set: %dMbps " |
138 | "%s Duplex", | 138 | "%s Duplex", |
139 | port->netdev->name, port->port_speed, | 139 | port->netdev->name, port->port_speed, |
140 | port->full_duplex == 1 ? "Full" : "Half"); | 140 | port->full_duplex == 1 ? "Full" : "Half"); |
diff --git a/drivers/net/hamradio/baycom_ser_fdx.c b/drivers/net/hamradio/baycom_ser_fdx.c index ed60fd664273..0cab992b3d1a 100644 --- a/drivers/net/hamradio/baycom_ser_fdx.c +++ b/drivers/net/hamradio/baycom_ser_fdx.c | |||
@@ -35,7 +35,7 @@ | |||
35 | * driver only supports standard serial hardware (8250, 16450, 16550A) | 35 | * driver only supports standard serial hardware (8250, 16450, 16550A) |
36 | * | 36 | * |
37 | * This modem usually draws its supply current out of the otherwise unused | 37 | * This modem usually draws its supply current out of the otherwise unused |
38 | * TXD pin of the serial port. Thus a contignuous stream of 0x00-bytes | 38 | * TXD pin of the serial port. Thus a contiguous stream of 0x00-bytes |
39 | * is transmitted to achieve a positive supply voltage. | 39 | * is transmitted to achieve a positive supply voltage. |
40 | * | 40 | * |
41 | * hsk: This is a 4800 baud FSK modem, designed for TNC use. It works fine | 41 | * hsk: This is a 4800 baud FSK modem, designed for TNC use. It works fine |
diff --git a/drivers/net/iseries_veth.c b/drivers/net/iseries_veth.c index aa7286bc4364..8739ba850f82 100644 --- a/drivers/net/iseries_veth.c +++ b/drivers/net/iseries_veth.c | |||
@@ -1384,7 +1384,7 @@ static inline void veth_build_dma_list(struct dma_chunk *list, | |||
1384 | unsigned long done; | 1384 | unsigned long done; |
1385 | int i = 1; | 1385 | int i = 1; |
1386 | 1386 | ||
1387 | /* FIXME: skbs are continguous in real addresses. Do we | 1387 | /* FIXME: skbs are contiguous in real addresses. Do we |
1388 | * really need to break it into PAGE_SIZE chunks, or can we do | 1388 | * really need to break it into PAGE_SIZE chunks, or can we do |
1389 | * it just at the granularity of iSeries real->absolute | 1389 | * it just at the granularity of iSeries real->absolute |
1390 | * mapping? Indeed, given the way the allocator works, can we | 1390 | * mapping? Indeed, given the way the allocator works, can we |
diff --git a/drivers/net/lasi_82596.c b/drivers/net/lasi_82596.c index a0c578585a50..b77238dbafb8 100644 --- a/drivers/net/lasi_82596.c +++ b/drivers/net/lasi_82596.c | |||
@@ -47,7 +47,7 @@ | |||
47 | TBD: | 47 | TBD: |
48 | * look at deferring rx frames rather than discarding (as per tulip) | 48 | * look at deferring rx frames rather than discarding (as per tulip) |
49 | * handle tx ring full as per tulip | 49 | * handle tx ring full as per tulip |
50 | * performace test to tune rx_copybreak | 50 | * performance test to tune rx_copybreak |
51 | 51 | ||
52 | Most of my modifications relate to the braindead big-endian | 52 | Most of my modifications relate to the braindead big-endian |
53 | implementation by Intel. When the i596 is operating in | 53 | implementation by Intel. When the i596 is operating in |
diff --git a/drivers/net/lib82596.c b/drivers/net/lib82596.c index 51e11c3e53e1..c0dbfc185b53 100644 --- a/drivers/net/lib82596.c +++ b/drivers/net/lib82596.c | |||
@@ -47,7 +47,7 @@ | |||
47 | TBD: | 47 | TBD: |
48 | * look at deferring rx frames rather than discarding (as per tulip) | 48 | * look at deferring rx frames rather than discarding (as per tulip) |
49 | * handle tx ring full as per tulip | 49 | * handle tx ring full as per tulip |
50 | * performace test to tune rx_copybreak | 50 | * performance test to tune rx_copybreak |
51 | 51 | ||
52 | Most of my modifications relate to the braindead big-endian | 52 | Most of my modifications relate to the braindead big-endian |
53 | implementation by Intel. When the i596 is operating in | 53 | implementation by Intel. When the i596 is operating in |
diff --git a/drivers/net/mlx4/en_rx.c b/drivers/net/mlx4/en_rx.c index 03b781a7a182..829b9ec9ff67 100644 --- a/drivers/net/mlx4/en_rx.c +++ b/drivers/net/mlx4/en_rx.c | |||
@@ -204,7 +204,7 @@ static void mlx4_en_free_rx_desc(struct mlx4_en_priv *priv, | |||
204 | en_dbg(DRV, priv, "Freeing fragment:%d\n", nr); | 204 | en_dbg(DRV, priv, "Freeing fragment:%d\n", nr); |
205 | dma = be64_to_cpu(rx_desc->data[nr].addr); | 205 | dma = be64_to_cpu(rx_desc->data[nr].addr); |
206 | 206 | ||
207 | en_dbg(DRV, priv, "Unmaping buffer at dma:0x%llx\n", (u64) dma); | 207 | en_dbg(DRV, priv, "Unmapping buffer at dma:0x%llx\n", (u64) dma); |
208 | pci_unmap_single(mdev->pdev, dma, skb_frags[nr].size, | 208 | pci_unmap_single(mdev->pdev, dma, skb_frags[nr].size, |
209 | PCI_DMA_FROMDEVICE); | 209 | PCI_DMA_FROMDEVICE); |
210 | put_page(skb_frags[nr].page); | 210 | put_page(skb_frags[nr].page); |
diff --git a/drivers/net/mlx4/en_tx.c b/drivers/net/mlx4/en_tx.c index 8c7279965b44..3d1396af9462 100644 --- a/drivers/net/mlx4/en_tx.c +++ b/drivers/net/mlx4/en_tx.c | |||
@@ -47,7 +47,7 @@ enum { | |||
47 | static int inline_thold __read_mostly = MAX_INLINE; | 47 | static int inline_thold __read_mostly = MAX_INLINE; |
48 | 48 | ||
49 | module_param_named(inline_thold, inline_thold, int, 0444); | 49 | module_param_named(inline_thold, inline_thold, int, 0444); |
50 | MODULE_PARM_DESC(inline_thold, "treshold for using inline data"); | 50 | MODULE_PARM_DESC(inline_thold, "threshold for using inline data"); |
51 | 51 | ||
52 | int mlx4_en_create_tx_ring(struct mlx4_en_priv *priv, | 52 | int mlx4_en_create_tx_ring(struct mlx4_en_priv *priv, |
53 | struct mlx4_en_tx_ring *ring, u32 size, | 53 | struct mlx4_en_tx_ring *ring, u32 size, |
diff --git a/drivers/net/mlx4/mlx4_en.h b/drivers/net/mlx4/mlx4_en.h index 4376147b0ea0..82c3ebc584e3 100644 --- a/drivers/net/mlx4/mlx4_en.h +++ b/drivers/net/mlx4/mlx4_en.h | |||
@@ -162,7 +162,7 @@ enum { | |||
162 | #define MLX4_EN_DEF_RX_PAUSE 1 | 162 | #define MLX4_EN_DEF_RX_PAUSE 1 |
163 | #define MLX4_EN_DEF_TX_PAUSE 1 | 163 | #define MLX4_EN_DEF_TX_PAUSE 1 |
164 | 164 | ||
165 | /* Interval between sucessive polls in the Tx routine when polling is used | 165 | /* Interval between successive polls in the Tx routine when polling is used |
166 | instead of interrupts (in per-core Tx rings) - should be power of 2 */ | 166 | instead of interrupts (in per-core Tx rings) - should be power of 2 */ |
167 | #define MLX4_EN_TX_POLL_MODER 16 | 167 | #define MLX4_EN_TX_POLL_MODER 16 |
168 | #define MLX4_EN_TX_POLL_TIMEOUT (HZ / 4) | 168 | #define MLX4_EN_TX_POLL_TIMEOUT (HZ / 4) |
diff --git a/drivers/net/ps3_gelic_net.c b/drivers/net/ps3_gelic_net.c index b211613e9dbd..86fde1a90a5a 100644 --- a/drivers/net/ps3_gelic_net.c +++ b/drivers/net/ps3_gelic_net.c | |||
@@ -296,7 +296,7 @@ static void gelic_card_reset_chain(struct gelic_card *card, | |||
296 | * @card: card structure | 296 | * @card: card structure |
297 | * @descr: descriptor to re-init | 297 | * @descr: descriptor to re-init |
298 | * | 298 | * |
299 | * return 0 on succes, <0 on failure | 299 | * return 0 on success, <0 on failure |
300 | * | 300 | * |
301 | * allocates a new rx skb, iommu-maps it and attaches it to the descriptor. | 301 | * allocates a new rx skb, iommu-maps it and attaches it to the descriptor. |
302 | * Activate the descriptor state-wise | 302 | * Activate the descriptor state-wise |
diff --git a/drivers/net/sis900.c b/drivers/net/sis900.c index c072f7f36acf..9d94a141555c 100644 --- a/drivers/net/sis900.c +++ b/drivers/net/sis900.c | |||
@@ -1760,7 +1760,7 @@ static int sis900_rx(struct net_device *net_dev) | |||
1760 | sis_priv->rx_ring[entry].bufptr, RX_BUF_SIZE, | 1760 | sis_priv->rx_ring[entry].bufptr, RX_BUF_SIZE, |
1761 | PCI_DMA_FROMDEVICE); | 1761 | PCI_DMA_FROMDEVICE); |
1762 | 1762 | ||
1763 | /* refill the Rx buffer, what if there is not enought | 1763 | /* refill the Rx buffer, what if there is not enough |
1764 | * memory for new socket buffer ?? */ | 1764 | * memory for new socket buffer ?? */ |
1765 | if ((skb = dev_alloc_skb(RX_BUF_SIZE)) == NULL) { | 1765 | if ((skb = dev_alloc_skb(RX_BUF_SIZE)) == NULL) { |
1766 | /* | 1766 | /* |
@@ -1775,7 +1775,7 @@ static int sis900_rx(struct net_device *net_dev) | |||
1775 | } | 1775 | } |
1776 | 1776 | ||
1777 | /* This situation should never happen, but due to | 1777 | /* This situation should never happen, but due to |
1778 | some unknow bugs, it is possible that | 1778 | some unknown bugs, it is possible that |
1779 | we are working on NULL sk_buff :-( */ | 1779 | we are working on NULL sk_buff :-( */ |
1780 | if (sis_priv->rx_skbuff[entry] == NULL) { | 1780 | if (sis_priv->rx_skbuff[entry] == NULL) { |
1781 | if (netif_msg_rx_err(sis_priv)) | 1781 | if (netif_msg_rx_err(sis_priv)) |
diff --git a/drivers/net/skfp/h/smc.h b/drivers/net/skfp/h/smc.h index 1758d9548361..026a83b9f743 100644 --- a/drivers/net/skfp/h/smc.h +++ b/drivers/net/skfp/h/smc.h | |||
@@ -393,10 +393,10 @@ struct smt_config { | |||
393 | */ | 393 | */ |
394 | u_long mac_d_max ; /* MAC : D_Max timer value */ | 394 | u_long mac_d_max ; /* MAC : D_Max timer value */ |
395 | 395 | ||
396 | u_long lct_short ; /* LCT : error threshhold */ | 396 | u_long lct_short ; /* LCT : error threshold */ |
397 | u_long lct_medium ; /* LCT : error threshhold */ | 397 | u_long lct_medium ; /* LCT : error threshold */ |
398 | u_long lct_long ; /* LCT : error threshhold */ | 398 | u_long lct_long ; /* LCT : error threshold */ |
399 | u_long lct_extended ; /* LCT : error threshhold */ | 399 | u_long lct_extended ; /* LCT : error threshold */ |
400 | } ; | 400 | } ; |
401 | 401 | ||
402 | #ifdef DEBUG | 402 | #ifdef DEBUG |
diff --git a/drivers/net/skfp/skfddi.c b/drivers/net/skfp/skfddi.c index b27156eaf267..db216a728503 100644 --- a/drivers/net/skfp/skfddi.c +++ b/drivers/net/skfp/skfddi.c | |||
@@ -1002,7 +1002,7 @@ static int skfp_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) | |||
1002 | } | 1002 | } |
1003 | break; | 1003 | break; |
1004 | default: | 1004 | default: |
1005 | printk("ioctl for %s: unknow cmd: %04x\n", dev->name, ioc.cmd); | 1005 | printk("ioctl for %s: unknown cmd: %04x\n", dev->name, ioc.cmd); |
1006 | status = -EOPNOTSUPP; | 1006 | status = -EOPNOTSUPP; |
1007 | 1007 | ||
1008 | } // switch | 1008 | } // switch |
diff --git a/drivers/net/smsc911x.c b/drivers/net/smsc911x.c index ccdd196f5297..4a00940d0a54 100644 --- a/drivers/net/smsc911x.c +++ b/drivers/net/smsc911x.c | |||
@@ -816,7 +816,7 @@ static int smsc911x_mii_probe(struct net_device *dev) | |||
816 | SMSC_TRACE(HW, "Passed Loop Back Test"); | 816 | SMSC_TRACE(HW, "Passed Loop Back Test"); |
817 | #endif /* USE_PHY_WORK_AROUND */ | 817 | #endif /* USE_PHY_WORK_AROUND */ |
818 | 818 | ||
819 | SMSC_TRACE(HW, "phy initialised succesfully"); | 819 | SMSC_TRACE(HW, "phy initialised successfully"); |
820 | return 0; | 820 | return 0; |
821 | } | 821 | } |
822 | 822 | ||
diff --git a/drivers/net/smsc911x.h b/drivers/net/smsc911x.h index b5716bd8a597..016360c65ce2 100644 --- a/drivers/net/smsc911x.h +++ b/drivers/net/smsc911x.h | |||
@@ -30,7 +30,7 @@ | |||
30 | #define SMSC_NAPI_WEIGHT 16 | 30 | #define SMSC_NAPI_WEIGHT 16 |
31 | 31 | ||
32 | /* implements a PHY loopback test at initialisation time, to ensure a packet | 32 | /* implements a PHY loopback test at initialisation time, to ensure a packet |
33 | * can be succesfully looped back */ | 33 | * can be successfully looped back */ |
34 | #define USE_PHY_WORK_AROUND | 34 | #define USE_PHY_WORK_AROUND |
35 | 35 | ||
36 | #define DPRINTK(nlevel, klevel, fmt, args...) \ | 36 | #define DPRINTK(nlevel, klevel, fmt, args...) \ |
diff --git a/drivers/net/spider_net.c b/drivers/net/spider_net.c index 90e663f4515c..40b51e6bc77b 100644 --- a/drivers/net/spider_net.c +++ b/drivers/net/spider_net.c | |||
@@ -409,7 +409,7 @@ spider_net_free_rx_chain_contents(struct spider_net_card *card) | |||
409 | * @card: card structure | 409 | * @card: card structure |
410 | * @descr: descriptor to re-init | 410 | * @descr: descriptor to re-init |
411 | * | 411 | * |
412 | * Return 0 on succes, <0 on failure. | 412 | * Return 0 on success, <0 on failure. |
413 | * | 413 | * |
414 | * Allocates a new rx skb, iommu-maps it and attaches it to the | 414 | * Allocates a new rx skb, iommu-maps it and attaches it to the |
415 | * descriptor. Mark the descriptor as activated, ready-to-use. | 415 | * descriptor. Mark the descriptor as activated, ready-to-use. |
diff --git a/drivers/net/stmmac/gmac.c b/drivers/net/stmmac/gmac.c index b624bb5bae0a..52586ee68953 100644 --- a/drivers/net/stmmac/gmac.c +++ b/drivers/net/stmmac/gmac.c | |||
@@ -112,7 +112,7 @@ static void gmac_dma_operation_mode(unsigned long ioaddr, int txmode, | |||
112 | " (threshold = %d)\n", txmode); | 112 | " (threshold = %d)\n", txmode); |
113 | csr6 &= ~DMA_CONTROL_TSF; | 113 | csr6 &= ~DMA_CONTROL_TSF; |
114 | csr6 &= DMA_CONTROL_TC_TX_MASK; | 114 | csr6 &= DMA_CONTROL_TC_TX_MASK; |
115 | /* Set the transmit threashold */ | 115 | /* Set the transmit threshold */ |
116 | if (txmode <= 32) | 116 | if (txmode <= 32) |
117 | csr6 |= DMA_CONTROL_TTC_32; | 117 | csr6 |= DMA_CONTROL_TTC_32; |
118 | else if (txmode <= 64) | 118 | else if (txmode <= 64) |
diff --git a/drivers/net/stmmac/gmac.h b/drivers/net/stmmac/gmac.h index 684a363120a9..2e82d6c9a148 100644 --- a/drivers/net/stmmac/gmac.h +++ b/drivers/net/stmmac/gmac.h | |||
@@ -154,14 +154,14 @@ enum rx_tx_priority_ratio { | |||
154 | #define DMA_CONTROL_DT 0x04000000 /* Disable Drop TCP/IP csum error */ | 154 | #define DMA_CONTROL_DT 0x04000000 /* Disable Drop TCP/IP csum error */ |
155 | #define DMA_CONTROL_RSF 0x02000000 /* Receive Store and Forward */ | 155 | #define DMA_CONTROL_RSF 0x02000000 /* Receive Store and Forward */ |
156 | #define DMA_CONTROL_DFF 0x01000000 /* Disaable flushing */ | 156 | #define DMA_CONTROL_DFF 0x01000000 /* Disaable flushing */ |
157 | /* Theshold for Activating the FC */ | 157 | /* Threshold for Activating the FC */ |
158 | enum rfa { | 158 | enum rfa { |
159 | act_full_minus_1 = 0x00800000, | 159 | act_full_minus_1 = 0x00800000, |
160 | act_full_minus_2 = 0x00800200, | 160 | act_full_minus_2 = 0x00800200, |
161 | act_full_minus_3 = 0x00800400, | 161 | act_full_minus_3 = 0x00800400, |
162 | act_full_minus_4 = 0x00800600, | 162 | act_full_minus_4 = 0x00800600, |
163 | }; | 163 | }; |
164 | /* Theshold for Deactivating the FC */ | 164 | /* Threshold for Deactivating the FC */ |
165 | enum rfd { | 165 | enum rfd { |
166 | deac_full_minus_1 = 0x00400000, | 166 | deac_full_minus_1 = 0x00400000, |
167 | deac_full_minus_2 = 0x00400800, | 167 | deac_full_minus_2 = 0x00400800, |
diff --git a/drivers/net/tokenring/smctr.c b/drivers/net/tokenring/smctr.c index ebda61bc4c2f..78e12b5e3ac7 100644 --- a/drivers/net/tokenring/smctr.c +++ b/drivers/net/tokenring/smctr.c | |||
@@ -426,7 +426,7 @@ static int smctr_alloc_shared_memory(struct net_device *dev) | |||
426 | smctr_malloc(dev, 1L); | 426 | smctr_malloc(dev, 1L); |
427 | 427 | ||
428 | /* Allocate Non-MAC receive data buffers. | 428 | /* Allocate Non-MAC receive data buffers. |
429 | * To guarantee a minimum of 256 contigous memory to | 429 | * To guarantee a minimum of 256 contiguous memory to |
430 | * UM_Receive_Packet's lookahead pointer, before a page | 430 | * UM_Receive_Packet's lookahead pointer, before a page |
431 | * change or ring end is encountered, place each rx buffer on | 431 | * change or ring end is encountered, place each rx buffer on |
432 | * a 256 byte boundary. | 432 | * a 256 byte boundary. |
diff --git a/drivers/net/ucc_geth.c b/drivers/net/ucc_geth.c index 4469f2451a6f..5e9adbaf6745 100644 --- a/drivers/net/ucc_geth.c +++ b/drivers/net/ucc_geth.c | |||
@@ -3798,7 +3798,7 @@ static int ucc_geth_probe(struct of_device* ofdev, const struct of_device_id *ma | |||
3798 | prop = of_get_property(np, "tx-clock", NULL); | 3798 | prop = of_get_property(np, "tx-clock", NULL); |
3799 | if (!prop) { | 3799 | if (!prop) { |
3800 | printk(KERN_ERR | 3800 | printk(KERN_ERR |
3801 | "ucc_geth: mising tx-clock-name property\n"); | 3801 | "ucc_geth: missing tx-clock-name property\n"); |
3802 | return -EINVAL; | 3802 | return -EINVAL; |
3803 | } | 3803 | } |
3804 | if ((*prop < QE_CLK_NONE) || (*prop > QE_CLK24)) { | 3804 | if ((*prop < QE_CLK_NONE) || (*prop > QE_CLK24)) { |
diff --git a/drivers/net/ucc_geth.h b/drivers/net/ucc_geth.h index 03a6ca016d5a..a007e2acf651 100644 --- a/drivers/net/ucc_geth.h +++ b/drivers/net/ucc_geth.h | |||
@@ -80,16 +80,16 @@ struct ucc_geth { | |||
80 | frames) received that were between 128 | 80 | frames) received that were between 128 |
81 | (Including FCS length==4) and 255 octets */ | 81 | (Including FCS length==4) and 255 octets */ |
82 | u32 txok; /* Total number of octets residing in frames | 82 | u32 txok; /* Total number of octets residing in frames |
83 | that where involved in succesfull | 83 | that where involved in successfull |
84 | transmission */ | 84 | transmission */ |
85 | u16 txcf; /* Total number of PAUSE control frames | 85 | u16 txcf; /* Total number of PAUSE control frames |
86 | transmitted by this MAC */ | 86 | transmitted by this MAC */ |
87 | u8 res4[0x2]; | 87 | u8 res4[0x2]; |
88 | u32 tmca; /* Total number of frames that were transmitted | 88 | u32 tmca; /* Total number of frames that were transmitted |
89 | succesfully with the group address bit set | 89 | successfully with the group address bit set |
90 | that are not broadcast frames */ | 90 | that are not broadcast frames */ |
91 | u32 tbca; /* Total number of frames transmitted | 91 | u32 tbca; /* Total number of frames transmitted |
92 | succesfully that had destination address | 92 | successfully that had destination address |
93 | field equal to the broadcast address */ | 93 | field equal to the broadcast address */ |
94 | u32 rxfok; /* Total number of frames received OK */ | 94 | u32 rxfok; /* Total number of frames received OK */ |
95 | u32 rxbok; /* Total number of octets received OK */ | 95 | u32 rxbok; /* Total number of octets received OK */ |
@@ -98,9 +98,9 @@ struct ucc_geth { | |||
98 | HW because it includes octets in frames that | 98 | HW because it includes octets in frames that |
99 | never even reach the UCC */ | 99 | never even reach the UCC */ |
100 | u32 rmca; /* Total number of frames that were received | 100 | u32 rmca; /* Total number of frames that were received |
101 | succesfully with the group address bit set | 101 | successfully with the group address bit set |
102 | that are not broadcast frames */ | 102 | that are not broadcast frames */ |
103 | u32 rbca; /* Total number of frames received succesfully | 103 | u32 rbca; /* Total number of frames received successfully |
104 | that had destination address equal to the | 104 | that had destination address equal to the |
105 | broadcast address */ | 105 | broadcast address */ |
106 | u32 scar; /* Statistics carry register */ | 106 | u32 scar; /* Statistics carry register */ |
@@ -759,15 +759,15 @@ struct ucc_geth_hardware_statistics { | |||
759 | frames) received that were between 128 | 759 | frames) received that were between 128 |
760 | (Including FCS length==4) and 255 octets */ | 760 | (Including FCS length==4) and 255 octets */ |
761 | u32 txok; /* Total number of octets residing in frames | 761 | u32 txok; /* Total number of octets residing in frames |
762 | that where involved in succesfull | 762 | that where involved in successfull |
763 | transmission */ | 763 | transmission */ |
764 | u16 txcf; /* Total number of PAUSE control frames | 764 | u16 txcf; /* Total number of PAUSE control frames |
765 | transmitted by this MAC */ | 765 | transmitted by this MAC */ |
766 | u32 tmca; /* Total number of frames that were transmitted | 766 | u32 tmca; /* Total number of frames that were transmitted |
767 | succesfully with the group address bit set | 767 | successfully with the group address bit set |
768 | that are not broadcast frames */ | 768 | that are not broadcast frames */ |
769 | u32 tbca; /* Total number of frames transmitted | 769 | u32 tbca; /* Total number of frames transmitted |
770 | succesfully that had destination address | 770 | successfully that had destination address |
771 | field equal to the broadcast address */ | 771 | field equal to the broadcast address */ |
772 | u32 rxfok; /* Total number of frames received OK */ | 772 | u32 rxfok; /* Total number of frames received OK */ |
773 | u32 rxbok; /* Total number of octets received OK */ | 773 | u32 rxbok; /* Total number of octets received OK */ |
@@ -776,9 +776,9 @@ struct ucc_geth_hardware_statistics { | |||
776 | HW because it includes octets in frames that | 776 | HW because it includes octets in frames that |
777 | never even reach the UCC */ | 777 | never even reach the UCC */ |
778 | u32 rmca; /* Total number of frames that were received | 778 | u32 rmca; /* Total number of frames that were received |
779 | succesfully with the group address bit set | 779 | successfully with the group address bit set |
780 | that are not broadcast frames */ | 780 | that are not broadcast frames */ |
781 | u32 rbca; /* Total number of frames received succesfully | 781 | u32 rbca; /* Total number of frames received successfully |
782 | that had destination address equal to the | 782 | that had destination address equal to the |
783 | broadcast address */ | 783 | broadcast address */ |
784 | } __attribute__ ((packed)); | 784 | } __attribute__ ((packed)); |
diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c index c6c922247d05..0c3c738d7419 100644 --- a/drivers/net/usb/smsc95xx.c +++ b/drivers/net/usb/smsc95xx.c | |||
@@ -748,7 +748,7 @@ static int smsc95xx_phy_initialize(struct usbnet *dev) | |||
748 | mii_nway_restart(&dev->mii); | 748 | mii_nway_restart(&dev->mii); |
749 | 749 | ||
750 | if (netif_msg_ifup(dev)) | 750 | if (netif_msg_ifup(dev)) |
751 | devdbg(dev, "phy initialised succesfully"); | 751 | devdbg(dev, "phy initialised successfully"); |
752 | return 0; | 752 | return 0; |
753 | } | 753 | } |
754 | 754 | ||
diff --git a/drivers/net/wan/lmc/lmc_main.c b/drivers/net/wan/lmc/lmc_main.c index 7ea71b33d2e9..ee784e091f67 100644 --- a/drivers/net/wan/lmc/lmc_main.c +++ b/drivers/net/wan/lmc/lmc_main.c | |||
@@ -927,7 +927,7 @@ static int __devinit lmc_init_one(struct pci_dev *pdev, | |||
927 | sc->lmc_media = &lmc_t1_media; | 927 | sc->lmc_media = &lmc_t1_media; |
928 | break; | 928 | break; |
929 | default: | 929 | default: |
930 | printk(KERN_WARNING "%s: LMC UNKOWN CARD!\n", dev->name); | 930 | printk(KERN_WARNING "%s: LMC UNKNOWN CARD!\n", dev->name); |
931 | break; | 931 | break; |
932 | } | 932 | } |
933 | 933 | ||
diff --git a/drivers/net/wimax/i2400m/rx.c b/drivers/net/wimax/i2400m/rx.c index 07c32e68909f..99d27473ba3f 100644 --- a/drivers/net/wimax/i2400m/rx.c +++ b/drivers/net/wimax/i2400m/rx.c | |||
@@ -1114,7 +1114,7 @@ error: | |||
1114 | * device. See the file header for the format. Run all checks on the | 1114 | * device. See the file header for the format. Run all checks on the |
1115 | * buffer header, then run over each payload's descriptors, verify | 1115 | * buffer header, then run over each payload's descriptors, verify |
1116 | * their consistency and act on each payload's contents. If | 1116 | * their consistency and act on each payload's contents. If |
1117 | * everything is succesful, update the device's statistics. | 1117 | * everything is successful, update the device's statistics. |
1118 | * | 1118 | * |
1119 | * Note: You need to set the skb to contain only the length of the | 1119 | * Note: You need to set the skb to contain only the length of the |
1120 | * received buffer; for that, use skb_trim(skb, RECEIVED_SIZE). | 1120 | * received buffer; for that, use skb_trim(skb, RECEIVED_SIZE). |
diff --git a/drivers/net/wireless/ath/ath5k/phy.c b/drivers/net/wireless/ath/ath5k/phy.c index 1a039f2bd732..6f04cc758dcc 100644 --- a/drivers/net/wireless/ath/ath5k/phy.c +++ b/drivers/net/wireless/ath/ath5k/phy.c | |||
@@ -117,7 +117,7 @@ static unsigned int ath5k_hw_rfb_op(struct ath5k_hw *ah, | |||
117 | 117 | ||
118 | /* | 118 | /* |
119 | * This code is used to optimize rf gain on different environments | 119 | * This code is used to optimize rf gain on different environments |
120 | * (temprature mostly) based on feedback from a power detector. | 120 | * (temperature mostly) based on feedback from a power detector. |
121 | * | 121 | * |
122 | * It's only used on RF5111 and RF5112, later RF chips seem to have | 122 | * It's only used on RF5111 and RF5112, later RF chips seem to have |
123 | * auto adjustment on hw -notice they have a much smaller BANK 7 and | 123 | * auto adjustment on hw -notice they have a much smaller BANK 7 and |
@@ -2675,7 +2675,7 @@ ath5k_setup_channel_powertable(struct ath5k_hw *ah, | |||
2675 | /* Fill curves in reverse order | 2675 | /* Fill curves in reverse order |
2676 | * from lower power (max gain) | 2676 | * from lower power (max gain) |
2677 | * to higher power. Use curve -> idx | 2677 | * to higher power. Use curve -> idx |
2678 | * backmaping we did on eeprom init */ | 2678 | * backmapping we did on eeprom init */ |
2679 | u8 idx = pdg_curve_to_idx[pdg]; | 2679 | u8 idx = pdg_curve_to_idx[pdg]; |
2680 | 2680 | ||
2681 | /* Grab the needed curves by index */ | 2681 | /* Grab the needed curves by index */ |
@@ -2777,7 +2777,7 @@ ath5k_setup_channel_powertable(struct ath5k_hw *ah, | |||
2777 | /* Now we have a set of curves for this | 2777 | /* Now we have a set of curves for this |
2778 | * channel on tmpL (x range is table_max - table_min | 2778 | * channel on tmpL (x range is table_max - table_min |
2779 | * and y values are tmpL[pdg][]) sorted in the same | 2779 | * and y values are tmpL[pdg][]) sorted in the same |
2780 | * order as EEPROM (because we've used the backmaping). | 2780 | * order as EEPROM (because we've used the backmapping). |
2781 | * So for RF5112 it's from higher power to lower power | 2781 | * So for RF5112 it's from higher power to lower power |
2782 | * and for RF2413 it's from lower power to higher power. | 2782 | * and for RF2413 it's from lower power to higher power. |
2783 | * For RF5111 we only have one curve. */ | 2783 | * For RF5111 we only have one curve. */ |
diff --git a/drivers/net/wireless/ath/ath9k/rc.c b/drivers/net/wireless/ath/ath9k/rc.c index 1895d63aad0a..0a35ee62a02a 100644 --- a/drivers/net/wireless/ath/ath9k/rc.c +++ b/drivers/net/wireless/ath/ath9k/rc.c | |||
@@ -969,7 +969,7 @@ static bool ath_rc_update_per(struct ath_softc *sc, | |||
969 | * Since this probe succeeded, we allow the next | 969 | * Since this probe succeeded, we allow the next |
970 | * probe twice as soon. This allows the maxRate | 970 | * probe twice as soon. This allows the maxRate |
971 | * to move up faster if the probes are | 971 | * to move up faster if the probes are |
972 | * succesful. | 972 | * successful. |
973 | */ | 973 | */ |
974 | ath_rc_priv->probe_time = | 974 | ath_rc_priv->probe_time = |
975 | now_msec - rate_table->probe_interval / 2; | 975 | now_msec - rate_table->probe_interval / 2; |
diff --git a/drivers/net/wireless/ipw2x00/ipw2100.c b/drivers/net/wireless/ipw2x00/ipw2100.c index a741d37fd96f..e1b330023200 100644 --- a/drivers/net/wireless/ipw2x00/ipw2100.c +++ b/drivers/net/wireless/ipw2x00/ipw2100.c | |||
@@ -551,7 +551,7 @@ static int ipw2100_get_ordinal(struct ipw2100_priv *priv, u32 ord, | |||
551 | /* get number of entries */ | 551 | /* get number of entries */ |
552 | field_count = *(((u16 *) & field_info) + 1); | 552 | field_count = *(((u16 *) & field_info) + 1); |
553 | 553 | ||
554 | /* abort if no enought memory */ | 554 | /* abort if no enough memory */ |
555 | total_length = field_len * field_count; | 555 | total_length = field_len * field_count; |
556 | if (total_length > *len) { | 556 | if (total_length > *len) { |
557 | *len = total_length; | 557 | *len = total_length; |
@@ -3044,7 +3044,7 @@ static void ipw2100_tx_send_data(struct ipw2100_priv *priv) | |||
3044 | IPW_MAX_BDS)) { | 3044 | IPW_MAX_BDS)) { |
3045 | /* TODO: Support merging buffers if more than | 3045 | /* TODO: Support merging buffers if more than |
3046 | * IPW_MAX_BDS are used */ | 3046 | * IPW_MAX_BDS are used */ |
3047 | IPW_DEBUG_INFO("%s: Maximum BD theshold exceeded. " | 3047 | IPW_DEBUG_INFO("%s: Maximum BD threshold exceeded. " |
3048 | "Increase fragmentation level.\n", | 3048 | "Increase fragmentation level.\n", |
3049 | priv->net_dev->name); | 3049 | priv->net_dev->name); |
3050 | } | 3050 | } |
@@ -6823,7 +6823,7 @@ static int ipw2100_wx_get_range(struct net_device *dev, | |||
6823 | range->max_qual.updated = 7; /* Updated all three */ | 6823 | range->max_qual.updated = 7; /* Updated all three */ |
6824 | 6824 | ||
6825 | range->avg_qual.qual = 70; /* > 8% missed beacons is 'bad' */ | 6825 | range->avg_qual.qual = 70; /* > 8% missed beacons is 'bad' */ |
6826 | /* TODO: Find real 'good' to 'bad' threshol value for RSSI */ | 6826 | /* TODO: Find real 'good' to 'bad' threshold value for RSSI */ |
6827 | range->avg_qual.level = 20 + IPW2100_RSSI_TO_DBM; | 6827 | range->avg_qual.level = 20 + IPW2100_RSSI_TO_DBM; |
6828 | range->avg_qual.noise = 0; | 6828 | range->avg_qual.noise = 0; |
6829 | range->avg_qual.updated = 7; /* Updated all three */ | 6829 | range->avg_qual.updated = 7; /* Updated all three */ |
diff --git a/drivers/net/wireless/ipw2x00/ipw2200.c b/drivers/net/wireless/ipw2x00/ipw2200.c index 9b0f2c0646e0..b2aa960b8346 100644 --- a/drivers/net/wireless/ipw2x00/ipw2200.c +++ b/drivers/net/wireless/ipw2x00/ipw2200.c | |||
@@ -787,7 +787,7 @@ static int ipw_get_ordinal(struct ipw_priv *priv, u32 ord, void *val, u32 * len) | |||
787 | /* get number of entries */ | 787 | /* get number of entries */ |
788 | field_count = *(((u16 *) & field_info) + 1); | 788 | field_count = *(((u16 *) & field_info) + 1); |
789 | 789 | ||
790 | /* abort if not enought memory */ | 790 | /* abort if not enough memory */ |
791 | total_len = field_len * field_count; | 791 | total_len = field_len * field_count; |
792 | if (total_len > *len) { | 792 | if (total_len > *len) { |
793 | *len = total_len; | 793 | *len = total_len; |
@@ -7751,7 +7751,7 @@ static void ipw_rebuild_decrypted_skb(struct ipw_priv *priv, | |||
7751 | case SEC_LEVEL_0: | 7751 | case SEC_LEVEL_0: |
7752 | break; | 7752 | break; |
7753 | default: | 7753 | default: |
7754 | printk(KERN_ERR "Unknow security level %d\n", | 7754 | printk(KERN_ERR "Unknown security level %d\n", |
7755 | priv->ieee->sec.level); | 7755 | priv->ieee->sec.level); |
7756 | break; | 7756 | break; |
7757 | } | 7757 | } |
@@ -8917,7 +8917,7 @@ static int ipw_wx_get_range(struct net_device *dev, | |||
8917 | range->max_qual.updated = 7; /* Updated all three */ | 8917 | range->max_qual.updated = 7; /* Updated all three */ |
8918 | 8918 | ||
8919 | range->avg_qual.qual = 70; | 8919 | range->avg_qual.qual = 70; |
8920 | /* TODO: Find real 'good' to 'bad' threshol value for RSSI */ | 8920 | /* TODO: Find real 'good' to 'bad' threshold value for RSSI */ |
8921 | range->avg_qual.level = 0; /* FIXME to real average level */ | 8921 | range->avg_qual.level = 0; /* FIXME to real average level */ |
8922 | range->avg_qual.noise = 0; | 8922 | range->avg_qual.noise = 0; |
8923 | range->avg_qual.updated = 7; /* Updated all three */ | 8923 | range->avg_qual.updated = 7; /* Updated all three */ |
@@ -10290,7 +10290,7 @@ static int ipw_tx_skb(struct ipw_priv *priv, struct libipw_txb *txb, | |||
10290 | case SEC_LEVEL_0: | 10290 | case SEC_LEVEL_0: |
10291 | break; | 10291 | break; |
10292 | default: | 10292 | default: |
10293 | printk(KERN_ERR "Unknow security level %d\n", | 10293 | printk(KERN_ERR "Unknown security level %d\n", |
10294 | priv->ieee->sec.level); | 10294 | priv->ieee->sec.level); |
10295 | break; | 10295 | break; |
10296 | } | 10296 | } |
diff --git a/drivers/net/wireless/ipw2x00/libipw_module.c b/drivers/net/wireless/ipw2x00/libipw_module.c index be5b809ec97a..20b8a8a20644 100644 --- a/drivers/net/wireless/ipw2x00/libipw_module.c +++ b/drivers/net/wireless/ipw2x00/libipw_module.c | |||
@@ -199,7 +199,7 @@ struct net_device *alloc_ieee80211(int sizeof_priv, int monitor) | |||
199 | ieee->host_decrypt = 1; | 199 | ieee->host_decrypt = 1; |
200 | ieee->host_mc_decrypt = 1; | 200 | ieee->host_mc_decrypt = 1; |
201 | 201 | ||
202 | /* Host fragementation in Open mode. Default is enabled. | 202 | /* Host fragmentation in Open mode. Default is enabled. |
203 | * Note: host fragmentation is always enabled if host encryption | 203 | * Note: host fragmentation is always enabled if host encryption |
204 | * is enabled. For cards can do hardware encryption, they must do | 204 | * is enabled. For cards can do hardware encryption, they must do |
205 | * hardware fragmentation as well. So we don't need a variable | 205 | * hardware fragmentation as well. So we don't need a variable |
diff --git a/drivers/net/wireless/iwmc3200wifi/hal.c b/drivers/net/wireless/iwmc3200wifi/hal.c index c430418248b4..d13c8853ee82 100644 --- a/drivers/net/wireless/iwmc3200wifi/hal.c +++ b/drivers/net/wireless/iwmc3200wifi/hal.c | |||
@@ -411,7 +411,7 @@ static void iwm_build_lmac_hdr(struct iwm_priv *iwm, struct iwm_lmac_hdr *hdr, | |||
411 | /* | 411 | /* |
412 | * iwm_hal_send_host_cmd(): sends commands to the UMAC or the LMAC. | 412 | * iwm_hal_send_host_cmd(): sends commands to the UMAC or the LMAC. |
413 | * Sending command to the LMAC is equivalent to sending a | 413 | * Sending command to the LMAC is equivalent to sending a |
414 | * regular UMAC command with the LMAC passtrough or the LMAC | 414 | * regular UMAC command with the LMAC passthrough or the LMAC |
415 | * wrapper UMAC command IDs. | 415 | * wrapper UMAC command IDs. |
416 | */ | 416 | */ |
417 | int iwm_hal_send_host_cmd(struct iwm_priv *iwm, | 417 | int iwm_hal_send_host_cmd(struct iwm_priv *iwm, |
diff --git a/drivers/net/wireless/iwmc3200wifi/rx.c b/drivers/net/wireless/iwmc3200wifi/rx.c index 771a301003c9..8ddb51a2a977 100644 --- a/drivers/net/wireless/iwmc3200wifi/rx.c +++ b/drivers/net/wireless/iwmc3200wifi/rx.c | |||
@@ -1448,7 +1448,7 @@ static void iwm_rx_process_packet(struct iwm_priv *iwm, | |||
1448 | kfree_skb(packet->skb); | 1448 | kfree_skb(packet->skb); |
1449 | break; | 1449 | break; |
1450 | default: | 1450 | default: |
1451 | IWM_ERR(iwm, "Unknow ticket action: %d\n", | 1451 | IWM_ERR(iwm, "Unknown ticket action: %d\n", |
1452 | le16_to_cpu(ticket_node->ticket->action)); | 1452 | le16_to_cpu(ticket_node->ticket->action)); |
1453 | kfree_skb(packet->skb); | 1453 | kfree_skb(packet->skb); |
1454 | } | 1454 | } |
diff --git a/drivers/net/wireless/libertas/if_sdio.c b/drivers/net/wireless/libertas/if_sdio.c index 485a8d406525..afe6abecc044 100644 --- a/drivers/net/wireless/libertas/if_sdio.c +++ b/drivers/net/wireless/libertas/if_sdio.c | |||
@@ -934,7 +934,7 @@ static int if_sdio_probe(struct sdio_func *func, | |||
934 | } | 934 | } |
935 | 935 | ||
936 | if (i == ARRAY_SIZE(if_sdio_models)) { | 936 | if (i == ARRAY_SIZE(if_sdio_models)) { |
937 | lbs_pr_err("unkown card model 0x%x\n", card->model); | 937 | lbs_pr_err("unknown card model 0x%x\n", card->model); |
938 | ret = -ENODEV; | 938 | ret = -ENODEV; |
939 | goto free; | 939 | goto free; |
940 | } | 940 | } |
diff --git a/drivers/net/wireless/prism54/isl_ioctl.c b/drivers/net/wireless/prism54/isl_ioctl.c index bc08464d8323..f7f5c793514b 100644 --- a/drivers/net/wireless/prism54/isl_ioctl.c +++ b/drivers/net/wireless/prism54/isl_ioctl.c | |||
@@ -1897,7 +1897,7 @@ prism54_get_mac(struct net_device *ndev, struct iw_request_info *info, | |||
1897 | return 0; | 1897 | return 0; |
1898 | } | 1898 | } |
1899 | 1899 | ||
1900 | /* Setting policy also clears the MAC acl, even if we don't change the defaut | 1900 | /* Setting policy also clears the MAC acl, even if we don't change the default |
1901 | * policy | 1901 | * policy |
1902 | */ | 1902 | */ |
1903 | 1903 | ||
@@ -2323,7 +2323,7 @@ prism54_process_trap_helper(islpci_private *priv, enum oid_num_t oid, | |||
2323 | 2323 | ||
2324 | case DOT11_OID_BEACON: | 2324 | case DOT11_OID_BEACON: |
2325 | send_formatted_event(priv, | 2325 | send_formatted_event(priv, |
2326 | "Received a beacon from an unkown AP", | 2326 | "Received a beacon from an unknown AP", |
2327 | mlme, 0); | 2327 | mlme, 0); |
2328 | break; | 2328 | break; |
2329 | 2329 | ||
diff --git a/drivers/net/wireless/rt2x00/rt2400pci.h b/drivers/net/wireless/rt2x00/rt2400pci.h index ccd644104ad1..aced05775693 100644 --- a/drivers/net/wireless/rt2x00/rt2400pci.h +++ b/drivers/net/wireless/rt2x00/rt2400pci.h | |||
@@ -35,7 +35,7 @@ | |||
35 | 35 | ||
36 | /* | 36 | /* |
37 | * Signal information. | 37 | * Signal information. |
38 | * Defaul offset is required for RSSI <-> dBm conversion. | 38 | * Default offset is required for RSSI <-> dBm conversion. |
39 | */ | 39 | */ |
40 | #define DEFAULT_RSSI_OFFSET 100 | 40 | #define DEFAULT_RSSI_OFFSET 100 |
41 | 41 | ||
diff --git a/drivers/net/wireless/rt2x00/rt2500pci.h b/drivers/net/wireless/rt2x00/rt2500pci.h index 54d37957883c..3db9041838a4 100644 --- a/drivers/net/wireless/rt2x00/rt2500pci.h +++ b/drivers/net/wireless/rt2x00/rt2500pci.h | |||
@@ -46,7 +46,7 @@ | |||
46 | 46 | ||
47 | /* | 47 | /* |
48 | * Signal information. | 48 | * Signal information. |
49 | * Defaul offset is required for RSSI <-> dBm conversion. | 49 | * Default offset is required for RSSI <-> dBm conversion. |
50 | */ | 50 | */ |
51 | #define DEFAULT_RSSI_OFFSET 121 | 51 | #define DEFAULT_RSSI_OFFSET 121 |
52 | 52 | ||
diff --git a/drivers/net/wireless/rt2x00/rt2500usb.h b/drivers/net/wireless/rt2x00/rt2500usb.h index b01edca42583..d3000827883a 100644 --- a/drivers/net/wireless/rt2x00/rt2500usb.h +++ b/drivers/net/wireless/rt2x00/rt2500usb.h | |||
@@ -46,7 +46,7 @@ | |||
46 | 46 | ||
47 | /* | 47 | /* |
48 | * Signal information. | 48 | * Signal information. |
49 | * Defaul offset is required for RSSI <-> dBm conversion. | 49 | * Default offset is required for RSSI <-> dBm conversion. |
50 | */ | 50 | */ |
51 | #define DEFAULT_RSSI_OFFSET 120 | 51 | #define DEFAULT_RSSI_OFFSET 120 |
52 | 52 | ||
diff --git a/drivers/net/wireless/rt2x00/rt61pci.h b/drivers/net/wireless/rt2x00/rt61pci.h index 93eb699165cc..77b5116f549b 100644 --- a/drivers/net/wireless/rt2x00/rt61pci.h +++ b/drivers/net/wireless/rt2x00/rt61pci.h | |||
@@ -37,7 +37,7 @@ | |||
37 | 37 | ||
38 | /* | 38 | /* |
39 | * Signal information. | 39 | * Signal information. |
40 | * Defaul offset is required for RSSI <-> dBm conversion. | 40 | * Default offset is required for RSSI <-> dBm conversion. |
41 | */ | 41 | */ |
42 | #define DEFAULT_RSSI_OFFSET 120 | 42 | #define DEFAULT_RSSI_OFFSET 120 |
43 | 43 | ||
diff --git a/drivers/net/wireless/rt2x00/rt73usb.h b/drivers/net/wireless/rt2x00/rt73usb.h index 81fe0be51c42..e194332dac5f 100644 --- a/drivers/net/wireless/rt2x00/rt73usb.h +++ b/drivers/net/wireless/rt2x00/rt73usb.h | |||
@@ -37,7 +37,7 @@ | |||
37 | 37 | ||
38 | /* | 38 | /* |
39 | * Signal information. | 39 | * Signal information. |
40 | * Defaul offset is required for RSSI <-> dBm conversion. | 40 | * Default offset is required for RSSI <-> dBm conversion. |
41 | */ | 41 | */ |
42 | #define DEFAULT_RSSI_OFFSET 120 | 42 | #define DEFAULT_RSSI_OFFSET 120 |
43 | 43 | ||
diff --git a/drivers/net/wireless/wavelan_cs.c b/drivers/net/wireless/wavelan_cs.c index 431a20ec6db6..b3b0b5b685c6 100644 --- a/drivers/net/wireless/wavelan_cs.c +++ b/drivers/net/wireless/wavelan_cs.c | |||
@@ -4011,7 +4011,7 @@ wavelan_interrupt(int irq, | |||
4011 | #endif | 4011 | #endif |
4012 | 4012 | ||
4013 | /* Prevent reentrancy. We need to do that because we may have | 4013 | /* Prevent reentrancy. We need to do that because we may have |
4014 | * multiple interrupt handler running concurently. | 4014 | * multiple interrupt handler running concurrently. |
4015 | * It is safe because interrupts are disabled before aquiring | 4015 | * It is safe because interrupts are disabled before aquiring |
4016 | * the spinlock. */ | 4016 | * the spinlock. */ |
4017 | spin_lock(&lp->spinlock); | 4017 | spin_lock(&lp->spinlock); |
diff --git a/drivers/net/wireless/zd1211rw/zd_mac.c b/drivers/net/wireless/zd1211rw/zd_mac.c index 6d666359a42f..2b7f96594373 100644 --- a/drivers/net/wireless/zd1211rw/zd_mac.c +++ b/drivers/net/wireless/zd1211rw/zd_mac.c | |||
@@ -312,7 +312,7 @@ static void tx_status(struct ieee80211_hw *hw, struct sk_buff *skb, | |||
312 | * zd_mac_tx_failed - callback for failed frames | 312 | * zd_mac_tx_failed - callback for failed frames |
313 | * @dev: the mac80211 wireless device | 313 | * @dev: the mac80211 wireless device |
314 | * | 314 | * |
315 | * This function is called if a frame couldn't be succesfully be | 315 | * This function is called if a frame couldn't be successfully be |
316 | * transferred. The first frame from the tx queue, will be selected and | 316 | * transferred. The first frame from the tx queue, will be selected and |
317 | * reported as error to the upper layers. | 317 | * reported as error to the upper layers. |
318 | */ | 318 | */ |