aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/ath/ath9k/main.c
diff options
context:
space:
mode:
authorLuis R. Rodriguez <lrodriguez@atheros.com>2009-09-10 11:50:20 -0400
committerJohn W. Linville <linville@tuxdriver.com>2009-10-07 16:39:25 -0400
commitf2b2143e60651228945f361c09de7ee752360cd1 (patch)
tree6b41a9cdcf7bb4609adb1e38594c94ecb0bb418a /drivers/net/wireless/ath/ath9k/main.c
parentbcd8f54a84ce99ade91c250a9bc850a9fd3389c1 (diff)
ath9k: make ath9k_hw_setbssidmask() and ath9k_hw_write_associd() use ath_hw
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/main.c')
-rw-r--r--drivers/net/wireless/ath/ath9k/main.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
index 216b72f9c85c..f2c1feb7d491 100644
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
@@ -975,14 +975,15 @@ static void ath9k_bss_assoc_info(struct ath_softc *sc,
975 struct ieee80211_vif *vif, 975 struct ieee80211_vif *vif,
976 struct ieee80211_bss_conf *bss_conf) 976 struct ieee80211_bss_conf *bss_conf)
977{ 977{
978 struct ath_hw *ah = sc->sc_ah;
978 979
979 if (bss_conf->assoc) { 980 if (bss_conf->assoc) {
980 DPRINTF(sc->sc_ah, ATH_DBG_CONFIG, "Bss Info ASSOC %d, bssid: %pM\n", 981 DPRINTF(ah, ATH_DBG_CONFIG, "Bss Info ASSOC %d, bssid: %pM\n",
981 bss_conf->aid, sc->curbssid); 982 bss_conf->aid, sc->curbssid);
982 983
983 /* New association, store aid */ 984 /* New association, store aid */
984 sc->curaid = bss_conf->aid; 985 sc->curaid = bss_conf->aid;
985 ath9k_hw_write_associd(sc); 986 ath9k_hw_write_associd(ah);
986 987
987 /* 988 /*
988 * Request a re-configuration of Beacon related timers 989 * Request a re-configuration of Beacon related timers
@@ -999,7 +1000,7 @@ static void ath9k_bss_assoc_info(struct ath_softc *sc,
999 1000
1000 ath_start_ani(sc); 1001 ath_start_ani(sc);
1001 } else { 1002 } else {
1002 DPRINTF(sc->sc_ah, ATH_DBG_CONFIG, "Bss Info DISASSOC\n"); 1003 DPRINTF(ah, ATH_DBG_CONFIG, "Bss Info DISASSOC\n");
1003 sc->curaid = 0; 1004 sc->curaid = 0;
1004 /* Stop ANI */ 1005 /* Stop ANI */
1005 del_timer_sync(&sc->ani.timer); 1006 del_timer_sync(&sc->ani.timer);
@@ -2801,7 +2802,7 @@ static void ath9k_bss_info_changed(struct ieee80211_hw *hw,
2801 ath9k_hw_setopmode(ah); 2802 ath9k_hw_setopmode(ah);
2802 memcpy(sc->curbssid, sc->sc_ah->macaddr, ETH_ALEN); 2803 memcpy(sc->curbssid, sc->sc_ah->macaddr, ETH_ALEN);
2803 sc->curaid = 0; 2804 sc->curaid = 0;
2804 ath9k_hw_write_associd(sc); 2805 ath9k_hw_write_associd(ah);
2805 /* Request full reset to get hw opmode changed properly */ 2806 /* Request full reset to get hw opmode changed properly */
2806 sc->sc_flags |= SC_OP_FULL_RESET; 2807 sc->sc_flags |= SC_OP_FULL_RESET;
2807 } 2808 }
@@ -2816,7 +2817,7 @@ static void ath9k_bss_info_changed(struct ieee80211_hw *hw,
2816 memcpy(sc->curbssid, bss_conf->bssid, ETH_ALEN); 2817 memcpy(sc->curbssid, bss_conf->bssid, ETH_ALEN);
2817 memcpy(avp->bssid, bss_conf->bssid, ETH_ALEN); 2818 memcpy(avp->bssid, bss_conf->bssid, ETH_ALEN);
2818 sc->curaid = 0; 2819 sc->curaid = 0;
2819 ath9k_hw_write_associd(sc); 2820 ath9k_hw_write_associd(ah);
2820 2821
2821 /* Set aggregation protection mode parameters */ 2822 /* Set aggregation protection mode parameters */
2822 sc->config.ath_aggr_prot = 0; 2823 sc->config.ath_aggr_prot = 0;