aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/ath/ath9k/main.c
diff options
context:
space:
mode:
authorRajkumar Manoharan <rmanoharan@atheros.com>2011-04-04 13:26:17 -0400
committerJohn W. Linville <linville@tuxdriver.com>2011-04-07 15:34:15 -0400
commit66da424177db4f4f2fa7a462db5912655aad966f (patch)
tree4c262cf18edb01935050bea48827230a637d7814 /drivers/net/wireless/ath/ath9k/main.c
parent59575d1c717815d62f1b5aeac74e5e60a1b27428 (diff)
ath9k: Cleanup ath_vif struct
Remove unused bssid from ath_vif and set av_bslot on beacon alloc/return. Signed-off-by: Rajkumar Manoharan <rmanoharan@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.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
index 88073f4c2b6a..6f300d7df88e 100644
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
@@ -1450,7 +1450,6 @@ static int ath9k_add_interface(struct ieee80211_hw *hw,
1450 struct ath_softc *sc = hw->priv; 1450 struct ath_softc *sc = hw->priv;
1451 struct ath_hw *ah = sc->sc_ah; 1451 struct ath_hw *ah = sc->sc_ah;
1452 struct ath_common *common = ath9k_hw_common(ah); 1452 struct ath_common *common = ath9k_hw_common(ah);
1453 struct ath_vif *avp = (void *)vif->drv_priv;
1454 int ret = 0; 1453 int ret = 0;
1455 1454
1456 mutex_lock(&sc->mutex); 1455 mutex_lock(&sc->mutex);
@@ -1491,10 +1490,6 @@ static int ath9k_add_interface(struct ieee80211_hw *hw,
1491 ath_dbg(common, ATH_DBG_CONFIG, 1490 ath_dbg(common, ATH_DBG_CONFIG,
1492 "Attach a VIF of type: %d\n", vif->type); 1491 "Attach a VIF of type: %d\n", vif->type);
1493 1492
1494 /* Set the VIF opmode */
1495 avp->av_opmode = vif->type;
1496 avp->av_bslot = -1;
1497
1498 sc->nvifs++; 1493 sc->nvifs++;
1499 1494
1500 ath9k_do_vif_add_setup(hw, vif); 1495 ath9k_do_vif_add_setup(hw, vif);
@@ -1910,7 +1905,6 @@ static void ath9k_bss_info_changed(struct ieee80211_hw *hw,
1910 if (changed & BSS_CHANGED_BSSID) { 1905 if (changed & BSS_CHANGED_BSSID) {
1911 /* Set BSSID */ 1906 /* Set BSSID */
1912 memcpy(common->curbssid, bss_conf->bssid, ETH_ALEN); 1907 memcpy(common->curbssid, bss_conf->bssid, ETH_ALEN);
1913 memcpy(avp->bssid, bss_conf->bssid, ETH_ALEN);
1914 common->curaid = 0; 1908 common->curaid = 0;
1915 ath9k_hw_write_associd(ah); 1909 ath9k_hw_write_associd(ah);
1916 1910