diff options
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/hw.c | 7 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath9k/main.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-sta.c | 4 |
3 files changed, 6 insertions, 7 deletions
diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c index 0b1dd10f1d8..1a27f39c1ad 100644 --- a/drivers/net/wireless/ath/ath9k/hw.c +++ b/drivers/net/wireless/ath/ath9k/hw.c | |||
@@ -807,12 +807,11 @@ static void ath9k_hw_init_mode_gain_regs(struct ath_hw *ah) | |||
807 | } | 807 | } |
808 | } | 808 | } |
809 | 809 | ||
810 | static void ath9k_hw_init_11a_eeprom_fix(struct ath_hw *ah) | 810 | static void ath9k_hw_init_eeprom_fix(struct ath_hw *ah) |
811 | { | 811 | { |
812 | u32 i, j; | 812 | u32 i, j; |
813 | 813 | ||
814 | if ((ah->hw_version.devid == AR9280_DEVID_PCI) && | 814 | if (ah->hw_version.devid == AR9280_DEVID_PCI) { |
815 | test_bit(ATH9K_MODE_11A, ah->caps.wireless_modes)) { | ||
816 | 815 | ||
817 | /* EEPROM Fixup */ | 816 | /* EEPROM Fixup */ |
818 | for (i = 0; i < ah->iniModes.ia_rows; i++) { | 817 | for (i = 0; i < ah->iniModes.ia_rows; i++) { |
@@ -932,7 +931,7 @@ int ath9k_hw_init(struct ath_hw *ah) | |||
932 | if (r) | 931 | if (r) |
933 | return r; | 932 | return r; |
934 | 933 | ||
935 | ath9k_hw_init_11a_eeprom_fix(ah); | 934 | ath9k_hw_init_eeprom_fix(ah); |
936 | 935 | ||
937 | r = ath9k_hw_init_macaddr(ah); | 936 | r = ath9k_hw_init_macaddr(ah); |
938 | if (r) { | 937 | if (r) { |
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c index c0c571c2e8c..6aaca0026da 100644 --- a/drivers/net/wireless/ath/ath9k/main.c +++ b/drivers/net/wireless/ath/ath9k/main.c | |||
@@ -1470,10 +1470,10 @@ static void ath9k_remove_interface(struct ieee80211_hw *hw, | |||
1470 | (sc->sc_ah->opmode == NL80211_IFTYPE_MESH_POINT)) { | 1470 | (sc->sc_ah->opmode == NL80211_IFTYPE_MESH_POINT)) { |
1471 | ath9k_ps_wakeup(sc); | 1471 | ath9k_ps_wakeup(sc); |
1472 | ath9k_hw_stoptxdma(sc->sc_ah, sc->beacon.beaconq); | 1472 | ath9k_hw_stoptxdma(sc->sc_ah, sc->beacon.beaconq); |
1473 | ath_beacon_return(sc, avp); | ||
1474 | ath9k_ps_restore(sc); | 1473 | ath9k_ps_restore(sc); |
1475 | } | 1474 | } |
1476 | 1475 | ||
1476 | ath_beacon_return(sc, avp); | ||
1477 | sc->sc_flags &= ~SC_OP_BEACONS; | 1477 | sc->sc_flags &= ~SC_OP_BEACONS; |
1478 | 1478 | ||
1479 | for (i = 0; i < ARRAY_SIZE(sc->beacon.bslot); i++) { | 1479 | for (i = 0; i < ARRAY_SIZE(sc->beacon.bslot); i++) { |
diff --git a/drivers/net/wireless/iwlwifi/iwl-sta.c b/drivers/net/wireless/iwlwifi/iwl-sta.c index cde09a890b7..90fbdb25399 100644 --- a/drivers/net/wireless/iwlwifi/iwl-sta.c +++ b/drivers/net/wireless/iwlwifi/iwl-sta.c | |||
@@ -297,7 +297,7 @@ u8 iwl_add_station(struct iwl_priv *priv, const u8 *addr, bool is_ap, u8 flags, | |||
297 | } | 297 | } |
298 | EXPORT_SYMBOL(iwl_add_station); | 298 | EXPORT_SYMBOL(iwl_add_station); |
299 | 299 | ||
300 | static void iwl_sta_ucode_deactivate(struct iwl_priv *priv, const char *addr) | 300 | static void iwl_sta_ucode_deactivate(struct iwl_priv *priv, const u8 *addr) |
301 | { | 301 | { |
302 | unsigned long flags; | 302 | unsigned long flags; |
303 | u8 sta_id = iwl_find_station(priv, addr); | 303 | u8 sta_id = iwl_find_station(priv, addr); |
@@ -324,7 +324,7 @@ static void iwl_remove_sta_callback(struct iwl_priv *priv, | |||
324 | { | 324 | { |
325 | struct iwl_rem_sta_cmd *rm_sta = | 325 | struct iwl_rem_sta_cmd *rm_sta = |
326 | (struct iwl_rem_sta_cmd *)cmd->cmd.payload; | 326 | (struct iwl_rem_sta_cmd *)cmd->cmd.payload; |
327 | const char *addr = rm_sta->addr; | 327 | const u8 *addr = rm_sta->addr; |
328 | 328 | ||
329 | if (pkt->hdr.flags & IWL_CMD_FAILED_MSK) { | 329 | if (pkt->hdr.flags & IWL_CMD_FAILED_MSK) { |
330 | IWL_ERR(priv, "Bad return from REPLY_REMOVE_STA (0x%08X)\n", | 330 | IWL_ERR(priv, "Bad return from REPLY_REMOVE_STA (0x%08X)\n", |