diff options
Diffstat (limited to 'drivers/net/wireless/ath9k/main.c')
-rw-r--r-- | drivers/net/wireless/ath9k/main.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/wireless/ath9k/main.c b/drivers/net/wireless/ath9k/main.c index 7504b64020c9..7fb57ee4c436 100644 --- a/drivers/net/wireless/ath9k/main.c +++ b/drivers/net/wireless/ath9k/main.c | |||
@@ -481,7 +481,7 @@ static void ath9k_remove_interface(struct ieee80211_hw *hw, | |||
481 | /* Set interrupt mask */ | 481 | /* Set interrupt mask */ |
482 | sc->sc_imask &= ~(ATH9K_INT_SWBA | ATH9K_INT_BMISS); | 482 | sc->sc_imask &= ~(ATH9K_INT_SWBA | ATH9K_INT_BMISS); |
483 | ath9k_hw_set_interrupts(sc->sc_ah, sc->sc_imask & ~ATH9K_INT_GLOBAL); | 483 | ath9k_hw_set_interrupts(sc->sc_ah, sc->sc_imask & ~ATH9K_INT_GLOBAL); |
484 | sc->sc_beacons = 0; | 484 | sc->sc_flags &= ~SC_OP_BEACONS; |
485 | 485 | ||
486 | error = ath_vap_detach(sc, 0); | 486 | error = ath_vap_detach(sc, 0); |
487 | if (error) | 487 | if (error) |
@@ -582,7 +582,7 @@ static int ath9k_config_interface(struct ieee80211_hw *hw, | |||
582 | print_mac(mac, sc->sc_curbssid), sc->sc_curaid); | 582 | print_mac(mac, sc->sc_curbssid), sc->sc_curaid); |
583 | 583 | ||
584 | /* need to reconfigure the beacon */ | 584 | /* need to reconfigure the beacon */ |
585 | sc->sc_beacons = 0; | 585 | sc->sc_flags &= ~SC_OP_BEACONS ; |
586 | 586 | ||
587 | break; | 587 | break; |
588 | default: | 588 | default: |
@@ -833,7 +833,7 @@ static void ath9k_bss_assoc_info(struct ath_softc *sc, | |||
833 | 833 | ||
834 | /* Configure the beacon */ | 834 | /* Configure the beacon */ |
835 | ath_beacon_config(sc, 0); | 835 | ath_beacon_config(sc, 0); |
836 | sc->sc_beacons = 1; | 836 | sc->sc_flags |= SC_OP_BEACONS; |
837 | 837 | ||
838 | /* Reset rssi stats */ | 838 | /* Reset rssi stats */ |
839 | sc->sc_halstats.ns_avgbrssi = ATH_RSSI_DUMMY_MARKER; | 839 | sc->sc_halstats.ns_avgbrssi = ATH_RSSI_DUMMY_MARKER; |
@@ -896,9 +896,9 @@ static void ath9k_bss_info_changed(struct ieee80211_hw *hw, | |||
896 | __func__, | 896 | __func__, |
897 | bss_conf->use_short_preamble); | 897 | bss_conf->use_short_preamble); |
898 | if (bss_conf->use_short_preamble) | 898 | if (bss_conf->use_short_preamble) |
899 | sc->sc_flags |= ATH_PREAMBLE_SHORT; | 899 | sc->sc_flags |= SC_OP_PREAMBLE_SHORT; |
900 | else | 900 | else |
901 | sc->sc_flags &= ~ATH_PREAMBLE_SHORT; | 901 | sc->sc_flags &= ~SC_OP_PREAMBLE_SHORT; |
902 | } | 902 | } |
903 | 903 | ||
904 | if (changed & BSS_CHANGED_ERP_CTS_PROT) { | 904 | if (changed & BSS_CHANGED_ERP_CTS_PROT) { |
@@ -907,9 +907,9 @@ static void ath9k_bss_info_changed(struct ieee80211_hw *hw, | |||
907 | bss_conf->use_cts_prot); | 907 | bss_conf->use_cts_prot); |
908 | if (bss_conf->use_cts_prot && | 908 | if (bss_conf->use_cts_prot && |
909 | hw->conf.channel->band != IEEE80211_BAND_5GHZ) | 909 | hw->conf.channel->band != IEEE80211_BAND_5GHZ) |
910 | sc->sc_flags |= ATH_PROTECT_ENABLE; | 910 | sc->sc_flags |= SC_OP_PROTECT_ENABLE; |
911 | else | 911 | else |
912 | sc->sc_flags &= ~ATH_PROTECT_ENABLE; | 912 | sc->sc_flags &= ~SC_OP_PROTECT_ENABLE; |
913 | } | 913 | } |
914 | 914 | ||
915 | if (changed & BSS_CHANGED_HT) { | 915 | if (changed & BSS_CHANGED_HT) { |