diff options
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r-- | drivers/net/wireless/ath/ath5k/reg.h | 6 | ||||
-rw-r--r-- | drivers/net/wireless/b43/phy_g.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/b43legacy/phy.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn-ict.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn.c | 4 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-legacy.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-sta.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/prism54/islpci_dev.c | 6 | ||||
-rw-r--r-- | drivers/net/wireless/prism54/islpci_eth.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00mac.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/wl1251/acx.h | 4 | ||||
-rw-r--r-- | drivers/net/wireless/wl1251/wl1251.h | 2 | ||||
-rw-r--r-- | drivers/net/wireless/wl12xx/acx.h | 4 | ||||
-rw-r--r-- | drivers/net/wireless/wl12xx/wl12xx.h | 4 | ||||
-rw-r--r-- | drivers/net/wireless/wl3501_cs.c | 2 |
15 files changed, 23 insertions, 23 deletions
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 */ |
1923 | static void b43_phy_init_pctl(struct b43_wldev *dev) | 1923 | static 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 | */ |
159 | static void b43legacy_phy_init_pctl(struct b43legacy_wldev *dev) | 159 | static 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 | ||
620 | none: | 620 | none: |
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. |