aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/bnx2x/bnx2x.h4
-rw-r--r--drivers/net/bnx2x/bnx2x_main.c2
-rw-r--r--drivers/net/bnx2x/bnx2x_reg.h2
-rw-r--r--drivers/net/bonding/bond_3ad.c6
-rw-r--r--drivers/net/chelsio/subr.c2
-rw-r--r--drivers/net/cxgb3/mc5.c2
-rw-r--r--drivers/net/cxgb3/t3_hw.c2
-rw-r--r--drivers/net/e1000/e1000_hw.h2
-rw-r--r--drivers/net/e1000/e1000_main.c2
-rw-r--r--drivers/net/e1000e/82571.c2
-rw-r--r--drivers/net/e1000e/ich8lan.c2
-rw-r--r--drivers/net/e1000e/phy.c2
-rw-r--r--drivers/net/eepro.c2
-rw-r--r--drivers/net/irda/donauboe.h2
-rw-r--r--drivers/net/ixgbe/ixgbe_82599.c4
-rw-r--r--drivers/net/ll_temac_main.c2
-rw-r--r--drivers/net/sis900.c2
-rw-r--r--drivers/net/tehuti.c6
-rw-r--r--drivers/net/tun.c2
-rw-r--r--drivers/net/via-velocity.c2
-rw-r--r--drivers/net/vxge/vxge-traffic.h2
-rw-r--r--drivers/net/wan/dscc4.c2
-rw-r--r--drivers/net/wimax/i2400m/driver.c2
-rw-r--r--drivers/net/wimax/i2400m/i2400m.h4
-rw-r--r--drivers/net/wireless/ath/ath5k/reg.h6
-rw-r--r--drivers/net/wireless/b43/phy_g.c2
-rw-r--r--drivers/net/wireless/b43legacy/phy.c2
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-agn-ict.c2
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-agn.c4
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-legacy.c2
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-sta.c2
-rw-r--r--drivers/net/wireless/prism54/islpci_dev.c6
-rw-r--r--drivers/net/wireless/prism54/islpci_eth.c2
-rw-r--r--drivers/net/wireless/rt2x00/rt2x00mac.c2
-rw-r--r--drivers/net/wireless/wl1251/acx.h4
-rw-r--r--drivers/net/wireless/wl1251/wl1251.h2
-rw-r--r--drivers/net/wireless/wl12xx/acx.h4
-rw-r--r--drivers/net/wireless/wl12xx/wl12xx.h4
-rw-r--r--drivers/net/wireless/wl3501_cs.c2
39 files changed, 54 insertions, 54 deletions
diff --git a/drivers/net/bnx2x/bnx2x.h b/drivers/net/bnx2x/bnx2x.h
index 6a858a29db56..a6cd335c9436 100644
--- a/drivers/net/bnx2x/bnx2x.h
+++ b/drivers/net/bnx2x/bnx2x.h
@@ -1415,12 +1415,12 @@ struct bnx2x_func_init_params {
1415 else 1415 else
1416 1416
1417/* skip rx queue 1417/* skip rx queue
1418 * if FCOE l2 support is diabled and this is the fcoe L2 queue 1418 * if FCOE l2 support is disabled and this is the fcoe L2 queue
1419 */ 1419 */
1420#define skip_rx_queue(bp, idx) (NO_FCOE(bp) && IS_FCOE_IDX(idx)) 1420#define skip_rx_queue(bp, idx) (NO_FCOE(bp) && IS_FCOE_IDX(idx))
1421 1421
1422/* skip tx queue 1422/* skip tx queue
1423 * if FCOE l2 support is diabled and this is the fcoe L2 queue 1423 * if FCOE l2 support is disabled and this is the fcoe L2 queue
1424 */ 1424 */
1425#define skip_tx_queue(bp, idx) (NO_FCOE(bp) && IS_FCOE_IDX(idx)) 1425#define skip_tx_queue(bp, idx) (NO_FCOE(bp) && IS_FCOE_IDX(idx))
1426 1426
diff --git a/drivers/net/bnx2x/bnx2x_main.c b/drivers/net/bnx2x/bnx2x_main.c
index 84e1af4d65e1..8cdcf5b39d1e 100644
--- a/drivers/net/bnx2x/bnx2x_main.c
+++ b/drivers/net/bnx2x/bnx2x_main.c
@@ -5037,7 +5037,7 @@ static int bnx2x_init_hw_common(struct bnx2x *bp, u32 load_code)
5037 memset(&ilt_cli, 0, sizeof(struct ilt_client_info)); 5037 memset(&ilt_cli, 0, sizeof(struct ilt_client_info));
5038 memset(&ilt, 0, sizeof(struct bnx2x_ilt)); 5038 memset(&ilt, 0, sizeof(struct bnx2x_ilt));
5039 5039
5040 /* initalize dummy TM client */ 5040 /* initialize dummy TM client */
5041 ilt_cli.start = 0; 5041 ilt_cli.start = 0;
5042 ilt_cli.end = ILT_NUM_PAGE_ENTRIES - 1; 5042 ilt_cli.end = ILT_NUM_PAGE_ENTRIES - 1;
5043 ilt_cli.client_num = ILT_CLIENT_TM; 5043 ilt_cli.client_num = ILT_CLIENT_TM;
diff --git a/drivers/net/bnx2x/bnx2x_reg.h b/drivers/net/bnx2x/bnx2x_reg.h
index 38ef7ca9f21d..c939683e3d61 100644
--- a/drivers/net/bnx2x/bnx2x_reg.h
+++ b/drivers/net/bnx2x/bnx2x_reg.h
@@ -1633,7 +1633,7 @@
1633 (~misc_registers_sw_timer_cfg_4.sw_timer_cfg_4[1] ) is set */ 1633 (~misc_registers_sw_timer_cfg_4.sw_timer_cfg_4[1] ) is set */
1634#define MISC_REG_SW_TIMER_RELOAD_VAL_4 0xa2fc 1634#define MISC_REG_SW_TIMER_RELOAD_VAL_4 0xa2fc
1635/* [RW 32] the value of the counter for sw timers1-8. there are 8 addresses 1635/* [RW 32] the value of the counter for sw timers1-8. there are 8 addresses
1636 in this register. addres 0 - timer 1; address 1 - timer 2, ... address 7 - 1636 in this register. address 0 - timer 1; address 1 - timer 2, ... address 7 -
1637 timer 8 */ 1637 timer 8 */
1638#define MISC_REG_SW_TIMER_VAL 0xa5c0 1638#define MISC_REG_SW_TIMER_VAL 0xa5c0
1639/* [RW 1] Set by the MCP to remember if one or more of the drivers is/are 1639/* [RW 1] Set by the MCP to remember if one or more of the drivers is/are
diff --git a/drivers/net/bonding/bond_3ad.c b/drivers/net/bonding/bond_3ad.c
index 48cf24ff4e6f..171782e2bb39 100644
--- a/drivers/net/bonding/bond_3ad.c
+++ b/drivers/net/bonding/bond_3ad.c
@@ -840,7 +840,7 @@ static int ad_lacpdu_send(struct port *port)
840 lacpdu_header = (struct lacpdu_header *)skb_put(skb, length); 840 lacpdu_header = (struct lacpdu_header *)skb_put(skb, length);
841 841
842 memcpy(lacpdu_header->hdr.h_dest, lacpdu_mcast_addr, ETH_ALEN); 842 memcpy(lacpdu_header->hdr.h_dest, lacpdu_mcast_addr, ETH_ALEN);
843 /* Note: source addres is set to be the member's PERMANENT address, 843 /* Note: source address is set to be the member's PERMANENT address,
844 because we use it to identify loopback lacpdus in receive. */ 844 because we use it to identify loopback lacpdus in receive. */
845 memcpy(lacpdu_header->hdr.h_source, slave->perm_hwaddr, ETH_ALEN); 845 memcpy(lacpdu_header->hdr.h_source, slave->perm_hwaddr, ETH_ALEN);
846 lacpdu_header->hdr.h_proto = PKT_TYPE_LACPDU; 846 lacpdu_header->hdr.h_proto = PKT_TYPE_LACPDU;
@@ -881,7 +881,7 @@ static int ad_marker_send(struct port *port, struct bond_marker *marker)
881 marker_header = (struct bond_marker_header *)skb_put(skb, length); 881 marker_header = (struct bond_marker_header *)skb_put(skb, length);
882 882
883 memcpy(marker_header->hdr.h_dest, lacpdu_mcast_addr, ETH_ALEN); 883 memcpy(marker_header->hdr.h_dest, lacpdu_mcast_addr, ETH_ALEN);
884 /* Note: source addres is set to be the member's PERMANENT address, 884 /* Note: source address is set to be the member's PERMANENT address,
885 because we use it to identify loopback MARKERs in receive. */ 885 because we use it to identify loopback MARKERs in receive. */
886 memcpy(marker_header->hdr.h_source, slave->perm_hwaddr, ETH_ALEN); 886 memcpy(marker_header->hdr.h_source, slave->perm_hwaddr, ETH_ALEN);
887 marker_header->hdr.h_proto = PKT_TYPE_LACPDU; 887 marker_header->hdr.h_proto = PKT_TYPE_LACPDU;
@@ -1916,7 +1916,7 @@ int bond_3ad_bind_slave(struct slave *slave)
1916 return -1; 1916 return -1;
1917 } 1917 }
1918 1918
1919 //check that the slave has not been intialized yet. 1919 //check that the slave has not been initialized yet.
1920 if (SLAVE_AD_INFO(slave).port.slave != slave) { 1920 if (SLAVE_AD_INFO(slave).port.slave != slave) {
1921 1921
1922 // port initialization 1922 // port initialization
diff --git a/drivers/net/chelsio/subr.c b/drivers/net/chelsio/subr.c
index 63ebf76d2390..8a43c7e19701 100644
--- a/drivers/net/chelsio/subr.c
+++ b/drivers/net/chelsio/subr.c
@@ -556,7 +556,7 @@ struct chelsio_vpd_t {
556#define EEPROM_MAX_POLL 4 556#define EEPROM_MAX_POLL 4
557 557
558/* 558/*
559 * Read SEEPROM. A zero is written to the flag register when the addres is 559 * Read SEEPROM. A zero is written to the flag register when the address is
560 * written to the Control register. The hardware device will set the flag to a 560 * written to the Control register. The hardware device will set the flag to a
561 * one when 4B have been transferred to the Data register. 561 * one when 4B have been transferred to the Data register.
562 */ 562 */
diff --git a/drivers/net/cxgb3/mc5.c b/drivers/net/cxgb3/mc5.c
index a8766fb2f9ab..e13b7fe9d082 100644
--- a/drivers/net/cxgb3/mc5.c
+++ b/drivers/net/cxgb3/mc5.c
@@ -318,7 +318,7 @@ static void mc5_dbgi_mode_disable(const struct mc5 *mc5)
318 318
319/* 319/*
320 * Initialization that requires the OS and protocol layers to already 320 * Initialization that requires the OS and protocol layers to already
321 * be intialized goes here. 321 * be initialized goes here.
322 */ 322 */
323int t3_mc5_init(struct mc5 *mc5, unsigned int nservers, unsigned int nfilters, 323int t3_mc5_init(struct mc5 *mc5, unsigned int nservers, unsigned int nfilters,
324 unsigned int nroutes) 324 unsigned int nroutes)
diff --git a/drivers/net/cxgb3/t3_hw.c b/drivers/net/cxgb3/t3_hw.c
index ec8579a0a808..d55db6b38e7b 100644
--- a/drivers/net/cxgb3/t3_hw.c
+++ b/drivers/net/cxgb3/t3_hw.c
@@ -607,7 +607,7 @@ struct t3_vpd {
607 * 607 *
608 * Read a 32-bit word from a location in VPD EEPROM using the card's PCI 608 * Read a 32-bit word from a location in VPD EEPROM using the card's PCI
609 * VPD ROM capability. A zero is written to the flag bit when the 609 * VPD ROM capability. A zero is written to the flag bit when the
610 * addres is written to the control register. The hardware device will 610 * address is written to the control register. The hardware device will
611 * set the flag to 1 when 4 bytes have been read into the data register. 611 * set the flag to 1 when 4 bytes have been read into the data register.
612 */ 612 */
613int t3_seeprom_read(struct adapter *adapter, u32 addr, __le32 *data) 613int t3_seeprom_read(struct adapter *adapter, u32 addr, __le32 *data)
diff --git a/drivers/net/e1000/e1000_hw.h b/drivers/net/e1000/e1000_hw.h
index f5514a0d5be6..196eeda2dd6c 100644
--- a/drivers/net/e1000/e1000_hw.h
+++ b/drivers/net/e1000/e1000_hw.h
@@ -41,7 +41,7 @@ struct e1000_hw;
41struct e1000_hw_stats; 41struct e1000_hw_stats;
42 42
43/* Enumerated types specific to the e1000 hardware */ 43/* Enumerated types specific to the e1000 hardware */
44/* Media Access Controlers */ 44/* Media Access Controllers */
45typedef enum { 45typedef enum {
46 e1000_undefined = 0, 46 e1000_undefined = 0,
47 e1000_82542_rev2_0, 47 e1000_82542_rev2_0,
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 4ff88a683f61..de69c54301c1 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -2233,7 +2233,7 @@ static void e1000_set_rx_mode(struct net_device *netdev)
2233 * addresses take precedence to avoid disabling unicast filtering 2233 * addresses take precedence to avoid disabling unicast filtering
2234 * when possible. 2234 * when possible.
2235 * 2235 *
2236 * RAR 0 is used for the station MAC adddress 2236 * RAR 0 is used for the station MAC address
2237 * if there are not 14 addresses, go ahead and clear the filters 2237 * if there are not 14 addresses, go ahead and clear the filters
2238 */ 2238 */
2239 i = 1; 2239 i = 1;
diff --git a/drivers/net/e1000e/82571.c b/drivers/net/e1000e/82571.c
index cb6c7b1c1fb8..1397da118f0d 100644
--- a/drivers/net/e1000e/82571.c
+++ b/drivers/net/e1000e/82571.c
@@ -328,7 +328,7 @@ static s32 e1000_init_mac_params_82571(struct e1000_adapter *adapter)
328 328
329 /* 329 /*
330 * Ensure that the inter-port SWSM.SMBI lock bit is clear before 330 * Ensure that the inter-port SWSM.SMBI lock bit is clear before
331 * first NVM or PHY acess. This should be done for single-port 331 * first NVM or PHY access. This should be done for single-port
332 * devices, and for one port only on dual-port devices so that 332 * devices, and for one port only on dual-port devices so that
333 * for those devices we can still use the SMBI lock to synchronize 333 * for those devices we can still use the SMBI lock to synchronize
334 * inter-port accesses to the PHY & NVM. 334 * inter-port accesses to the PHY & NVM.
diff --git a/drivers/net/e1000e/ich8lan.c b/drivers/net/e1000e/ich8lan.c
index 5328a2927731..5bb65b7382db 100644
--- a/drivers/net/e1000e/ich8lan.c
+++ b/drivers/net/e1000e/ich8lan.c
@@ -321,7 +321,7 @@ static s32 e1000_init_phy_params_pchlan(struct e1000_hw *hw)
321 } 321 }
322 322
323 /* 323 /*
324 * Reset the PHY before any acccess to it. Doing so, ensures that 324 * Reset the PHY before any access to it. Doing so, ensures that
325 * the PHY is in a known good state before we read/write PHY registers. 325 * the PHY is in a known good state before we read/write PHY registers.
326 * The generic reset is sufficient here, because we haven't determined 326 * The generic reset is sufficient here, because we haven't determined
327 * the PHY type yet. 327 * the PHY type yet.
diff --git a/drivers/net/e1000e/phy.c b/drivers/net/e1000e/phy.c
index a640f1c369ae..00f89e8a9fa0 100644
--- a/drivers/net/e1000e/phy.c
+++ b/drivers/net/e1000e/phy.c
@@ -2986,7 +2986,7 @@ s32 e1000_write_phy_reg_hv_locked(struct e1000_hw *hw, u32 offset, u16 data)
2986} 2986}
2987 2987
2988/** 2988/**
2989 * e1000_get_phy_addr_for_hv_page - Get PHY adrress based on page 2989 * e1000_get_phy_addr_for_hv_page - Get PHY address based on page
2990 * @page: page to be accessed 2990 * @page: page to be accessed
2991 **/ 2991 **/
2992static u32 e1000_get_phy_addr_for_hv_page(u32 page) 2992static u32 e1000_get_phy_addr_for_hv_page(u32 page)
diff --git a/drivers/net/eepro.c b/drivers/net/eepro.c
index 4fa8d2a4aef3..eb35951a2442 100644
--- a/drivers/net/eepro.c
+++ b/drivers/net/eepro.c
@@ -1761,7 +1761,7 @@ module_param_array(io, int, NULL, 0);
1761module_param_array(irq, int, NULL, 0); 1761module_param_array(irq, int, NULL, 0);
1762module_param_array(mem, int, NULL, 0); 1762module_param_array(mem, int, NULL, 0);
1763module_param(autodetect, int, 0); 1763module_param(autodetect, int, 0);
1764MODULE_PARM_DESC(io, "EtherExpress Pro/10 I/O base addres(es)"); 1764MODULE_PARM_DESC(io, "EtherExpress Pro/10 I/O base address(es)");
1765MODULE_PARM_DESC(irq, "EtherExpress Pro/10 IRQ number(s)"); 1765MODULE_PARM_DESC(irq, "EtherExpress Pro/10 IRQ number(s)");
1766MODULE_PARM_DESC(mem, "EtherExpress Pro/10 Rx buffer size(es) in kB (3-29)"); 1766MODULE_PARM_DESC(mem, "EtherExpress Pro/10 Rx buffer size(es) in kB (3-29)");
1767MODULE_PARM_DESC(autodetect, "EtherExpress Pro/10 force board(s) detection (0-1)"); 1767MODULE_PARM_DESC(autodetect, "EtherExpress Pro/10 force board(s) detection (0-1)");
diff --git a/drivers/net/irda/donauboe.h b/drivers/net/irda/donauboe.h
index 4dc39e5f0156..77fcf4459161 100644
--- a/drivers/net/irda/donauboe.h
+++ b/drivers/net/irda/donauboe.h
@@ -30,7 +30,7 @@
30 * or the type-DO IR port. 30 * or the type-DO IR port.
31 * 31 *
32 * IrDA chip set list from Toshiba Computer Engineering Corp. 32 * IrDA chip set list from Toshiba Computer Engineering Corp.
33 * model method maker controler Version 33 * model method maker controller Version
34 * Portege 320CT FIR,SIR Toshiba Oboe(Triangle) 34 * Portege 320CT FIR,SIR Toshiba Oboe(Triangle)
35 * Portege 3010CT FIR,SIR Toshiba Oboe(Sydney) 35 * Portege 3010CT FIR,SIR Toshiba Oboe(Sydney)
36 * Portege 3015CT FIR,SIR Toshiba Oboe(Sydney) 36 * Portege 3015CT FIR,SIR Toshiba Oboe(Sydney)
diff --git a/drivers/net/ixgbe/ixgbe_82599.c b/drivers/net/ixgbe/ixgbe_82599.c
index 8d316d9cd29d..a21f5817685b 100644
--- a/drivers/net/ixgbe/ixgbe_82599.c
+++ b/drivers/net/ixgbe/ixgbe_82599.c
@@ -1079,7 +1079,7 @@ s32 ixgbe_init_fdir_signature_82599(struct ixgbe_hw *hw, u32 pballoc)
1079 1079
1080 /* 1080 /*
1081 * The defaults in the HW for RX PB 1-7 are not zero and so should be 1081 * The defaults in the HW for RX PB 1-7 are not zero and so should be
1082 * intialized to zero for non DCB mode otherwise actual total RX PB 1082 * initialized to zero for non DCB mode otherwise actual total RX PB
1083 * would be bigger than programmed and filter space would run into 1083 * would be bigger than programmed and filter space would run into
1084 * the PB 0 region. 1084 * the PB 0 region.
1085 */ 1085 */
@@ -1167,7 +1167,7 @@ s32 ixgbe_init_fdir_perfect_82599(struct ixgbe_hw *hw, u32 pballoc)
1167 1167
1168 /* 1168 /*
1169 * The defaults in the HW for RX PB 1-7 are not zero and so should be 1169 * The defaults in the HW for RX PB 1-7 are not zero and so should be
1170 * intialized to zero for non DCB mode otherwise actual total RX PB 1170 * initialized to zero for non DCB mode otherwise actual total RX PB
1171 * would be bigger than programmed and filter space would run into 1171 * would be bigger than programmed and filter space would run into
1172 * the PB 0 region. 1172 * the PB 0 region.
1173 */ 1173 */
diff --git a/drivers/net/ll_temac_main.c b/drivers/net/ll_temac_main.c
index 183765cb7f25..f35554d11441 100644
--- a/drivers/net/ll_temac_main.c
+++ b/drivers/net/ll_temac_main.c
@@ -238,7 +238,7 @@ static int temac_dma_bd_init(struct net_device *ndev)
238 goto out; 238 goto out;
239 } 239 }
240 /* allocate the tx and rx ring buffer descriptors. */ 240 /* allocate the tx and rx ring buffer descriptors. */
241 /* returns a virtual addres and a physical address. */ 241 /* returns a virtual address and a physical address. */
242 lp->tx_bd_v = dma_alloc_coherent(ndev->dev.parent, 242 lp->tx_bd_v = dma_alloc_coherent(ndev->dev.parent,
243 sizeof(*lp->tx_bd_v) * TX_BD_NUM, 243 sizeof(*lp->tx_bd_v) * TX_BD_NUM,
244 &lp->tx_bd_p, GFP_KERNEL); 244 &lp->tx_bd_p, GFP_KERNEL);
diff --git a/drivers/net/sis900.c b/drivers/net/sis900.c
index 581836867098..5976d1d51df1 100644
--- a/drivers/net/sis900.c
+++ b/drivers/net/sis900.c
@@ -36,7 +36,7 @@
36 Rev 1.07.06 Nov. 7 2000 Jeff Garzik <jgarzik@pobox.com> some bug fix and cleaning 36 Rev 1.07.06 Nov. 7 2000 Jeff Garzik <jgarzik@pobox.com> some bug fix and cleaning
37 Rev 1.07.05 Nov. 6 2000 metapirat<metapirat@gmx.de> contribute media type select by ifconfig 37 Rev 1.07.05 Nov. 6 2000 metapirat<metapirat@gmx.de> contribute media type select by ifconfig
38 Rev 1.07.04 Sep. 6 2000 Lei-Chun Chang added ICS1893 PHY support 38 Rev 1.07.04 Sep. 6 2000 Lei-Chun Chang added ICS1893 PHY support
39 Rev 1.07.03 Aug. 24 2000 Lei-Chun Chang (lcchang@sis.com.tw) modified 630E eqaulizer workaround rule 39 Rev 1.07.03 Aug. 24 2000 Lei-Chun Chang (lcchang@sis.com.tw) modified 630E equalizer workaround rule
40 Rev 1.07.01 Aug. 08 2000 Ollie Lho minor update for SiS 630E and SiS 630E A1 40 Rev 1.07.01 Aug. 08 2000 Ollie Lho minor update for SiS 630E and SiS 630E A1
41 Rev 1.07 Mar. 07 2000 Ollie Lho bug fix in Rx buffer ring 41 Rev 1.07 Mar. 07 2000 Ollie Lho bug fix in Rx buffer ring
42 Rev 1.06.04 Feb. 11 2000 Jeff Garzik <jgarzik@pobox.com> softnet and init for kernel 2.4 42 Rev 1.06.04 Feb. 11 2000 Jeff Garzik <jgarzik@pobox.com> softnet and init for kernel 2.4
diff --git a/drivers/net/tehuti.c b/drivers/net/tehuti.c
index 296000bf5a25..3397618d4d96 100644
--- a/drivers/net/tehuti.c
+++ b/drivers/net/tehuti.c
@@ -12,7 +12,7 @@
12/* 12/*
13 * RX HW/SW interaction overview 13 * RX HW/SW interaction overview
14 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 14 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
15 * There are 2 types of RX communication channels betwean driver and NIC. 15 * There are 2 types of RX communication channels between driver and NIC.
16 * 1) RX Free Fifo - RXF - holds descriptors of empty buffers to accept incoming 16 * 1) RX Free Fifo - RXF - holds descriptors of empty buffers to accept incoming
17 * traffic. This Fifo is filled by SW and is readen by HW. Each descriptor holds 17 * traffic. This Fifo is filled by SW and is readen by HW. Each descriptor holds
18 * info about buffer's location, size and ID. An ID field is used to identify a 18 * info about buffer's location, size and ID. An ID field is used to identify a
@@ -821,7 +821,7 @@ static void bdx_setmulti(struct net_device *ndev)
821 } 821 }
822 822
823 /* use PMF to accept first MAC_MCST_NUM (15) addresses */ 823 /* use PMF to accept first MAC_MCST_NUM (15) addresses */
824 /* TBD: sort addreses and write them in ascending order 824 /* TBD: sort addresses and write them in ascending order
825 * into RX_MAC_MCST regs. we skip this phase now and accept ALL 825 * into RX_MAC_MCST regs. we skip this phase now and accept ALL
826 * multicast frames throu IMF */ 826 * multicast frames throu IMF */
827 /* accept the rest of addresses throu IMF */ 827 /* accept the rest of addresses throu IMF */
@@ -1346,7 +1346,7 @@ static void print_rxfd(struct rxf_desc *rxfd)
1346/* 1346/*
1347 * TX HW/SW interaction overview 1347 * TX HW/SW interaction overview
1348 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 1348 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1349 * There are 2 types of TX communication channels betwean driver and NIC. 1349 * There are 2 types of TX communication channels between driver and NIC.
1350 * 1) TX Free Fifo - TXF - holds ack descriptors for sent packets 1350 * 1) TX Free Fifo - TXF - holds ack descriptors for sent packets
1351 * 2) TX Data Fifo - TXD - holds descriptors of full buffers. 1351 * 2) TX Data Fifo - TXD - holds descriptors of full buffers.
1352 * 1352 *
diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index 7599c457abd1..b100bd50a0d7 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -1309,7 +1309,7 @@ static long __tun_chr_ioctl(struct file *file, unsigned int cmd,
1309 break; 1309 break;
1310 1310
1311 case SIOCGIFHWADDR: 1311 case SIOCGIFHWADDR:
1312 /* Get hw addres */ 1312 /* Get hw address */
1313 memcpy(ifr.ifr_hwaddr.sa_data, tun->dev->dev_addr, ETH_ALEN); 1313 memcpy(ifr.ifr_hwaddr.sa_data, tun->dev->dev_addr, ETH_ALEN);
1314 ifr.ifr_hwaddr.sa_family = tun->dev->type; 1314 ifr.ifr_hwaddr.sa_family = tun->dev->type;
1315 if (copy_to_user(argp, &ifr, ifreq_len)) 1315 if (copy_to_user(argp, &ifr, ifreq_len))
diff --git a/drivers/net/via-velocity.c b/drivers/net/via-velocity.c
index cab96ad49e60..09cac704fdd7 100644
--- a/drivers/net/via-velocity.c
+++ b/drivers/net/via-velocity.c
@@ -898,7 +898,7 @@ static int velocity_set_media_mode(struct velocity_info *vptr, u32 mii_status)
898 set_mii_flow_control(vptr); 898 set_mii_flow_control(vptr);
899 899
900 /* 900 /*
901 Check if new status is consisent with current status 901 Check if new status is consistent with current status
902 if (((mii_status & curr_status) & VELOCITY_AUTONEG_ENABLE) || 902 if (((mii_status & curr_status) & VELOCITY_AUTONEG_ENABLE) ||
903 (mii_status==curr_status)) { 903 (mii_status==curr_status)) {
904 vptr->mii_status=mii_check_media_mode(vptr->mac_regs); 904 vptr->mii_status=mii_check_media_mode(vptr->mac_regs);
diff --git a/drivers/net/vxge/vxge-traffic.h b/drivers/net/vxge/vxge-traffic.h
index 8c3103fb6442..d48486d6afa1 100644
--- a/drivers/net/vxge/vxge-traffic.h
+++ b/drivers/net/vxge/vxge-traffic.h
@@ -1695,7 +1695,7 @@ struct vxge_hw_device_stats_sw_err {
1695 * struct vxge_hw_device_stats - Contains HW per-device statistics, 1695 * struct vxge_hw_device_stats - Contains HW per-device statistics,
1696 * including hw. 1696 * including hw.
1697 * @devh: HW device handle. 1697 * @devh: HW device handle.
1698 * @dma_addr: DMA addres of the %hw_info. Given to device to fill-in the stats. 1698 * @dma_addr: DMA address of the %hw_info. Given to device to fill-in the stats.
1699 * @hw_info_dmah: DMA handle used to map hw statistics onto the device memory 1699 * @hw_info_dmah: DMA handle used to map hw statistics onto the device memory
1700 * space. 1700 * space.
1701 * @hw_info_dma_acch: One more DMA handle used subsequently to free the 1701 * @hw_info_dma_acch: One more DMA handle used subsequently to free the
diff --git a/drivers/net/wan/dscc4.c b/drivers/net/wan/dscc4.c
index 34cff6ce6d27..4578e5b4b411 100644
--- a/drivers/net/wan/dscc4.c
+++ b/drivers/net/wan/dscc4.c
@@ -125,7 +125,7 @@ static u32 dscc4_pci_config_store[16];
125/* Module parameters */ 125/* Module parameters */
126 126
127MODULE_AUTHOR("Maintainer: Francois Romieu <romieu@cogenit.fr>"); 127MODULE_AUTHOR("Maintainer: Francois Romieu <romieu@cogenit.fr>");
128MODULE_DESCRIPTION("Siemens PEB20534 PCI Controler"); 128MODULE_DESCRIPTION("Siemens PEB20534 PCI Controller");
129MODULE_LICENSE("GPL"); 129MODULE_LICENSE("GPL");
130module_param(debug, int, 0); 130module_param(debug, int, 0);
131MODULE_PARM_DESC(debug,"Enable/disable extra messages"); 131MODULE_PARM_DESC(debug,"Enable/disable extra messages");
diff --git a/drivers/net/wimax/i2400m/driver.c b/drivers/net/wimax/i2400m/driver.c
index f0603327aafa..65bc334ed57b 100644
--- a/drivers/net/wimax/i2400m/driver.c
+++ b/drivers/net/wimax/i2400m/driver.c
@@ -232,7 +232,7 @@ int i2400m_check_mac_addr(struct i2400m *i2400m)
232 result); 232 result);
233 goto error; 233 goto error;
234 } 234 }
235 /* Extract MAC addresss */ 235 /* Extract MAC address */
236 ddi = (void *) skb->data; 236 ddi = (void *) skb->data;
237 BUILD_BUG_ON(ETH_ALEN != sizeof(ddi->mac_address)); 237 BUILD_BUG_ON(ETH_ALEN != sizeof(ddi->mac_address));
238 d_printf(2, dev, "GET DEVICE INFO: mac addr %pM\n", 238 d_printf(2, dev, "GET DEVICE INFO: mac addr %pM\n",
diff --git a/drivers/net/wimax/i2400m/i2400m.h b/drivers/net/wimax/i2400m/i2400m.h
index 17ecaa41a807..030cbfd31704 100644
--- a/drivers/net/wimax/i2400m/i2400m.h
+++ b/drivers/net/wimax/i2400m/i2400m.h
@@ -186,7 +186,7 @@ enum {
186 * struct i2400m_poke_table - Hardware poke table for the Intel 2400m 186 * struct i2400m_poke_table - Hardware poke table for the Intel 2400m
187 * 187 *
188 * This structure will be used to create a device specific poke table 188 * This structure will be used to create a device specific poke table
189 * to put the device in a consistant state at boot time. 189 * to put the device in a consistent state at boot time.
190 * 190 *
191 * @address: The device address to poke 191 * @address: The device address to poke
192 * 192 *
@@ -703,7 +703,7 @@ enum i2400m_bm_cmd_flags {
703 * @I2400M_BRI_MAC_REINIT: We need to reinitialize the boot 703 * @I2400M_BRI_MAC_REINIT: We need to reinitialize the boot
704 * rom after reading the MAC address. This is quite a dirty hack, 704 * rom after reading the MAC address. This is quite a dirty hack,
705 * if you ask me -- the device requires the bootrom to be 705 * if you ask me -- the device requires the bootrom to be
706 * intialized after reading the MAC address. 706 * initialized after reading the MAC address.
707 */ 707 */
708enum i2400m_bri { 708enum i2400m_bri {
709 I2400M_BRI_SOFT = 1 << 1, 709 I2400M_BRI_SOFT = 1 << 1,
diff --git a/drivers/net/wireless/ath/ath5k/reg.h b/drivers/net/wireless/ath/ath5k/reg.h
index 7ad05d401ab5..fd14b9103951 100644
--- a/drivers/net/wireless/ath/ath5k/reg.h
+++ b/drivers/net/wireless/ath/ath5k/reg.h
@@ -1064,7 +1064,7 @@
1064/* 1064/*
1065 * EEPROM command register 1065 * EEPROM command register
1066 */ 1066 */
1067#define AR5K_EEPROM_CMD 0x6008 /* Register Addres */ 1067#define AR5K_EEPROM_CMD 0x6008 /* Register Address */
1068#define AR5K_EEPROM_CMD_READ 0x00000001 /* EEPROM read */ 1068#define AR5K_EEPROM_CMD_READ 0x00000001 /* EEPROM read */
1069#define AR5K_EEPROM_CMD_WRITE 0x00000002 /* EEPROM write */ 1069#define AR5K_EEPROM_CMD_WRITE 0x00000002 /* EEPROM write */
1070#define AR5K_EEPROM_CMD_RESET 0x00000004 /* EEPROM reset */ 1070#define AR5K_EEPROM_CMD_RESET 0x00000004 /* EEPROM reset */
@@ -1084,7 +1084,7 @@
1084/* 1084/*
1085 * EEPROM config register 1085 * EEPROM config register
1086 */ 1086 */
1087#define AR5K_EEPROM_CFG 0x6010 /* Register Addres */ 1087#define AR5K_EEPROM_CFG 0x6010 /* Register Address */
1088#define AR5K_EEPROM_CFG_SIZE 0x00000003 /* Size determination override */ 1088#define AR5K_EEPROM_CFG_SIZE 0x00000003 /* Size determination override */
1089#define AR5K_EEPROM_CFG_SIZE_AUTO 0 1089#define AR5K_EEPROM_CFG_SIZE_AUTO 0
1090#define AR5K_EEPROM_CFG_SIZE_4KBIT 1 1090#define AR5K_EEPROM_CFG_SIZE_4KBIT 1
@@ -1126,7 +1126,7 @@
1126 * Second station id register (Upper 16 bits of MAC address + PCU settings) 1126 * Second station id register (Upper 16 bits of MAC address + PCU settings)
1127 */ 1127 */
1128#define AR5K_STA_ID1 0x8004 /* Register Address */ 1128#define AR5K_STA_ID1 0x8004 /* Register Address */
1129#define AR5K_STA_ID1_ADDR_U16 0x0000ffff /* Upper 16 bits of MAC addres */ 1129#define AR5K_STA_ID1_ADDR_U16 0x0000ffff /* Upper 16 bits of MAC address */
1130#define AR5K_STA_ID1_AP 0x00010000 /* Set AP mode */ 1130#define AR5K_STA_ID1_AP 0x00010000 /* Set AP mode */
1131#define AR5K_STA_ID1_ADHOC 0x00020000 /* Set Ad-Hoc mode */ 1131#define AR5K_STA_ID1_ADHOC 0x00020000 /* Set Ad-Hoc mode */
1132#define AR5K_STA_ID1_PWR_SV 0x00040000 /* Power save reporting */ 1132#define AR5K_STA_ID1_PWR_SV 0x00040000 /* Power save reporting */
diff --git a/drivers/net/wireless/b43/phy_g.c b/drivers/net/wireless/b43/phy_g.c
index 0dc33b65e86b..be4828167012 100644
--- a/drivers/net/wireless/b43/phy_g.c
+++ b/drivers/net/wireless/b43/phy_g.c
@@ -1919,7 +1919,7 @@ static void b43_hardware_pctl_init_gphy(struct b43_wldev *dev)
1919 b43_hf_write(dev, b43_hf_read(dev) | B43_HF_HWPCTL); 1919 b43_hf_write(dev, b43_hf_read(dev) | B43_HF_HWPCTL);
1920} 1920}
1921 1921
1922/* Intialize B/G PHY power control */ 1922/* Initialize B/G PHY power control */
1923static void b43_phy_init_pctl(struct b43_wldev *dev) 1923static void b43_phy_init_pctl(struct b43_wldev *dev)
1924{ 1924{
1925 struct ssb_bus *bus = dev->dev->bus; 1925 struct ssb_bus *bus = dev->dev->bus;
diff --git a/drivers/net/wireless/b43legacy/phy.c b/drivers/net/wireless/b43legacy/phy.c
index 35033dd342ce..28e477d01587 100644
--- a/drivers/net/wireless/b43legacy/phy.c
+++ b/drivers/net/wireless/b43legacy/phy.c
@@ -153,7 +153,7 @@ void b43legacy_phy_calibrate(struct b43legacy_wldev *dev)
153 phy->calibrated = 1; 153 phy->calibrated = 1;
154} 154}
155 155
156/* intialize B PHY power control 156/* initialize B PHY power control
157 * as described in http://bcm-specs.sipsolutions.net/InitPowerControl 157 * as described in http://bcm-specs.sipsolutions.net/InitPowerControl
158 */ 158 */
159static void b43legacy_phy_init_pctl(struct b43legacy_wldev *dev) 159static void b43legacy_phy_init_pctl(struct b43legacy_wldev *dev)
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-ict.c b/drivers/net/wireless/iwlwifi/iwl-agn-ict.c
index a5dbfea1bfad..b5cb3be0eb4b 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-ict.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-ict.c
@@ -197,7 +197,7 @@ static irqreturn_t iwl_isr(int irq, void *data)
197 197
198 none: 198 none:
199 /* re-enable interrupts here since we don't have anything to service. */ 199 /* re-enable interrupts here since we don't have anything to service. */
200 /* only Re-enable if diabled by irq and no schedules tasklet. */ 200 /* only Re-enable if disabled by irq and no schedules tasklet. */
201 if (test_bit(STATUS_INT_ENABLED, &priv->status) && !priv->_agn.inta) 201 if (test_bit(STATUS_INT_ENABLED, &priv->status) && !priv->_agn.inta)
202 iwl_enable_interrupts(priv); 202 iwl_enable_interrupts(priv);
203 203
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index f13a83a7e62b..36335b1b54d4 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -1154,7 +1154,7 @@ static void iwl_irq_tasklet_legacy(struct iwl_priv *priv)
1154 } 1154 }
1155 1155
1156 /* Re-enable all interrupts */ 1156 /* Re-enable all interrupts */
1157 /* only Re-enable if diabled by irq */ 1157 /* only Re-enable if disabled by irq */
1158 if (test_bit(STATUS_INT_ENABLED, &priv->status)) 1158 if (test_bit(STATUS_INT_ENABLED, &priv->status))
1159 iwl_enable_interrupts(priv); 1159 iwl_enable_interrupts(priv);
1160 1160
@@ -1368,7 +1368,7 @@ static void iwl_irq_tasklet(struct iwl_priv *priv)
1368 } 1368 }
1369 1369
1370 /* Re-enable all interrupts */ 1370 /* Re-enable all interrupts */
1371 /* only Re-enable if diabled by irq */ 1371 /* only Re-enable if disabled by irq */
1372 if (test_bit(STATUS_INT_ENABLED, &priv->status)) 1372 if (test_bit(STATUS_INT_ENABLED, &priv->status))
1373 iwl_enable_interrupts(priv); 1373 iwl_enable_interrupts(priv);
1374} 1374}
diff --git a/drivers/net/wireless/iwlwifi/iwl-legacy.c b/drivers/net/wireless/iwlwifi/iwl-legacy.c
index a08b4e56e6b1..bb1a742a98a0 100644
--- a/drivers/net/wireless/iwlwifi/iwl-legacy.c
+++ b/drivers/net/wireless/iwlwifi/iwl-legacy.c
@@ -619,7 +619,7 @@ unplugged:
619 619
620none: 620none:
621 /* re-enable interrupts here since we don't have anything to service. */ 621 /* re-enable interrupts here since we don't have anything to service. */
622 /* only Re-enable if diabled by irq */ 622 /* only Re-enable if disabled by irq */
623 if (test_bit(STATUS_INT_ENABLED, &priv->status)) 623 if (test_bit(STATUS_INT_ENABLED, &priv->status))
624 iwl_enable_interrupts(priv); 624 iwl_enable_interrupts(priv);
625 spin_unlock_irqrestore(&priv->lock, flags); 625 spin_unlock_irqrestore(&priv->lock, flags);
diff --git a/drivers/net/wireless/iwlwifi/iwl-sta.c b/drivers/net/wireless/iwlwifi/iwl-sta.c
index 4776323b1eba..49493d176515 100644
--- a/drivers/net/wireless/iwlwifi/iwl-sta.c
+++ b/drivers/net/wireless/iwlwifi/iwl-sta.c
@@ -107,7 +107,7 @@ static int iwl_process_add_sta_resp(struct iwl_priv *priv,
107 /* 107 /*
108 * XXX: The MAC address in the command buffer is often changed from 108 * XXX: The MAC address in the command buffer is often changed from
109 * the original sent to the device. That is, the MAC address 109 * the original sent to the device. That is, the MAC address
110 * written to the command buffer often is not the same MAC adress 110 * written to the command buffer often is not the same MAC address
111 * read from the command buffer when the command returns. This 111 * read from the command buffer when the command returns. This
112 * issue has not yet been resolved and this debugging is left to 112 * issue has not yet been resolved and this debugging is left to
113 * observe the problem. 113 * observe the problem.
diff --git a/drivers/net/wireless/prism54/islpci_dev.c b/drivers/net/wireless/prism54/islpci_dev.c
index 2c8cc954d1b6..ec2c75d77cea 100644
--- a/drivers/net/wireless/prism54/islpci_dev.c
+++ b/drivers/net/wireless/prism54/islpci_dev.c
@@ -630,7 +630,7 @@ islpci_alloc_memory(islpci_private *priv)
630 printk(KERN_DEBUG "islpci_alloc_memory\n"); 630 printk(KERN_DEBUG "islpci_alloc_memory\n");
631#endif 631#endif
632 632
633 /* remap the PCI device base address to accessable */ 633 /* remap the PCI device base address to accessible */
634 if (!(priv->device_base = 634 if (!(priv->device_base =
635 ioremap(pci_resource_start(priv->pdev, 0), 635 ioremap(pci_resource_start(priv->pdev, 0),
636 ISL38XX_PCI_MEM_SIZE))) { 636 ISL38XX_PCI_MEM_SIZE))) {
@@ -709,7 +709,7 @@ islpci_alloc_memory(islpci_private *priv)
709 PCI_DMA_FROMDEVICE); 709 PCI_DMA_FROMDEVICE);
710 if (!priv->pci_map_rx_address[counter]) { 710 if (!priv->pci_map_rx_address[counter]) {
711 /* error mapping the buffer to device 711 /* error mapping the buffer to device
712 accessable memory address */ 712 accessible memory address */
713 printk(KERN_ERR "failed to map skb DMA'able\n"); 713 printk(KERN_ERR "failed to map skb DMA'able\n");
714 goto out_free; 714 goto out_free;
715 } 715 }
@@ -773,7 +773,7 @@ islpci_free_memory(islpci_private *priv)
773 priv->data_low_rx[counter] = NULL; 773 priv->data_low_rx[counter] = NULL;
774 } 774 }
775 775
776 /* Free the acces control list and the WPA list */ 776 /* Free the access control list and the WPA list */
777 prism54_acl_clean(&priv->acl); 777 prism54_acl_clean(&priv->acl);
778 prism54_wpa_bss_ie_clean(priv); 778 prism54_wpa_bss_ie_clean(priv);
779 mgt_clean(priv); 779 mgt_clean(priv);
diff --git a/drivers/net/wireless/prism54/islpci_eth.c b/drivers/net/wireless/prism54/islpci_eth.c
index 2fc52bc2d7dd..d44f8e20cce0 100644
--- a/drivers/net/wireless/prism54/islpci_eth.c
+++ b/drivers/net/wireless/prism54/islpci_eth.c
@@ -450,7 +450,7 @@ islpci_eth_receive(islpci_private *priv)
450 MAX_FRAGMENT_SIZE_RX + 2, 450 MAX_FRAGMENT_SIZE_RX + 2,
451 PCI_DMA_FROMDEVICE); 451 PCI_DMA_FROMDEVICE);
452 if (unlikely(!priv->pci_map_rx_address[index])) { 452 if (unlikely(!priv->pci_map_rx_address[index])) {
453 /* error mapping the buffer to device accessable memory address */ 453 /* error mapping the buffer to device accessible memory address */
454 DEBUG(SHOW_ERROR_MESSAGES, 454 DEBUG(SHOW_ERROR_MESSAGES,
455 "Error mapping DMA address\n"); 455 "Error mapping DMA address\n");
456 456
diff --git a/drivers/net/wireless/rt2x00/rt2x00mac.c b/drivers/net/wireless/rt2x00/rt2x00mac.c
index 658542d2efe1..f3da051df39e 100644
--- a/drivers/net/wireless/rt2x00/rt2x00mac.c
+++ b/drivers/net/wireless/rt2x00/rt2x00mac.c
@@ -273,7 +273,7 @@ int rt2x00mac_add_interface(struct ieee80211_hw *hw,
273 intf->beacon = entry; 273 intf->beacon = entry;
274 274
275 /* 275 /*
276 * The MAC adddress must be configured after the device 276 * The MAC address must be configured after the device
277 * has been initialized. Otherwise the device can reset 277 * has been initialized. Otherwise the device can reset
278 * the MAC registers. 278 * the MAC registers.
279 * The BSSID address must only be configured in AP mode, 279 * The BSSID address must only be configured in AP mode,
diff --git a/drivers/net/wireless/wl1251/acx.h b/drivers/net/wireless/wl1251/acx.h
index e54b21a4f8b1..efcc3aaca14f 100644
--- a/drivers/net/wireless/wl1251/acx.h
+++ b/drivers/net/wireless/wl1251/acx.h
@@ -1272,10 +1272,10 @@ struct wl1251_acx_tid_cfg {
1272/* OBSOLETE */ 1272/* OBSOLETE */
1273#define WL1251_ACX_INTR_WAKE_ON_HOST BIT(6) 1273#define WL1251_ACX_INTR_WAKE_ON_HOST BIT(6)
1274 1274
1275/* Trace meassge on MBOX #A */ 1275/* Trace message on MBOX #A */
1276#define WL1251_ACX_INTR_TRACE_A BIT(7) 1276#define WL1251_ACX_INTR_TRACE_A BIT(7)
1277 1277
1278/* Trace meassge on MBOX #B */ 1278/* Trace message on MBOX #B */
1279#define WL1251_ACX_INTR_TRACE_B BIT(8) 1279#define WL1251_ACX_INTR_TRACE_B BIT(8)
1280 1280
1281/* Command processing completion */ 1281/* Command processing completion */
diff --git a/drivers/net/wireless/wl1251/wl1251.h b/drivers/net/wireless/wl1251/wl1251.h
index 13fbeeccf609..c0ce2c8b43b8 100644
--- a/drivers/net/wireless/wl1251/wl1251.h
+++ b/drivers/net/wireless/wl1251/wl1251.h
@@ -419,7 +419,7 @@ void wl1251_disable_interrupts(struct wl1251 *wl);
419#define WL1251_FW_NAME "wl1251-fw.bin" 419#define WL1251_FW_NAME "wl1251-fw.bin"
420#define WL1251_NVS_NAME "wl1251-nvs.bin" 420#define WL1251_NVS_NAME "wl1251-nvs.bin"
421 421
422#define WL1251_POWER_ON_SLEEP 10 /* in miliseconds */ 422#define WL1251_POWER_ON_SLEEP 10 /* in milliseconds */
423 423
424#define WL1251_PART_DOWN_MEM_START 0x0 424#define WL1251_PART_DOWN_MEM_START 0x0
425#define WL1251_PART_DOWN_MEM_SIZE 0x16800 425#define WL1251_PART_DOWN_MEM_SIZE 0x16800
diff --git a/drivers/net/wireless/wl12xx/acx.h b/drivers/net/wireless/wl12xx/acx.h
index 9cbc3f40c8dd..7bd8e4db4a71 100644
--- a/drivers/net/wireless/wl12xx/acx.h
+++ b/drivers/net/wireless/wl12xx/acx.h
@@ -47,9 +47,9 @@
47#define WL1271_ACX_INTR_HW_AVAILABLE BIT(5) 47#define WL1271_ACX_INTR_HW_AVAILABLE BIT(5)
48/* The MISC bit is used for aggregation of RX, TxComplete and TX rate update */ 48/* The MISC bit is used for aggregation of RX, TxComplete and TX rate update */
49#define WL1271_ACX_INTR_DATA BIT(6) 49#define WL1271_ACX_INTR_DATA BIT(6)
50/* Trace meassge on MBOX #A */ 50/* Trace message on MBOX #A */
51#define WL1271_ACX_INTR_TRACE_A BIT(7) 51#define WL1271_ACX_INTR_TRACE_A BIT(7)
52/* Trace meassge on MBOX #B */ 52/* Trace message on MBOX #B */
53#define WL1271_ACX_INTR_TRACE_B BIT(8) 53#define WL1271_ACX_INTR_TRACE_B BIT(8)
54 54
55#define WL1271_ACX_INTR_ALL 0xFFFFFFFF 55#define WL1271_ACX_INTR_ALL 0xFFFFFFFF
diff --git a/drivers/net/wireless/wl12xx/wl12xx.h b/drivers/net/wireless/wl12xx/wl12xx.h
index ce3d31f98c55..9050dd9b62d2 100644
--- a/drivers/net/wireless/wl12xx/wl12xx.h
+++ b/drivers/net/wireless/wl12xx/wl12xx.h
@@ -416,8 +416,8 @@ int wl1271_plt_stop(struct wl1271 *wl);
416 416
417/* WL1271 needs a 200ms sleep after power on, and a 20ms sleep before power 417/* WL1271 needs a 200ms sleep after power on, and a 20ms sleep before power
418 on in case is has been shut down shortly before */ 418 on in case is has been shut down shortly before */
419#define WL1271_PRE_POWER_ON_SLEEP 20 /* in miliseconds */ 419#define WL1271_PRE_POWER_ON_SLEEP 20 /* in milliseconds */
420#define WL1271_POWER_ON_SLEEP 200 /* in miliseconds */ 420#define WL1271_POWER_ON_SLEEP 200 /* in milliseconds */
421 421
422/* Macros to handle wl1271.sta_rate_set */ 422/* Macros to handle wl1271.sta_rate_set */
423#define HW_BG_RATES_MASK 0xffff 423#define HW_BG_RATES_MASK 0xffff
diff --git a/drivers/net/wireless/wl3501_cs.c b/drivers/net/wireless/wl3501_cs.c
index ee82df62e646..3e5befe4d03b 100644
--- a/drivers/net/wireless/wl3501_cs.c
+++ b/drivers/net/wireless/wl3501_cs.c
@@ -192,7 +192,7 @@ static inline void wl3501_switch_page(struct wl3501_card *this, u8 page)
192} 192}
193 193
194/* 194/*
195 * Get Ethernet MAC addresss. 195 * Get Ethernet MAC address.
196 * 196 *
197 * WARNING: We switch to FPAGE0 and switc back again. 197 * WARNING: We switch to FPAGE0 and switc back again.
198 * Making sure there is no other WL function beening called by ISR. 198 * Making sure there is no other WL function beening called by ISR.