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>

diff --git a/drivers/net/wireless/ath/ath9k/ath9k.h b/drivers/net/wireless/ath/ath9k/ath9k.h
index a43f0599368787eae1c16b566d8427551a85f3e7..f3a753096d7df0465dc15c99a0dcb99feed37aa3 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/ath9k.h
+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
@@ -346,9 +346,7 @@ struct ath_vif {
        int av_bslot;
        bool is_bslot_active;
        __le64 tsf_adjust; /* TSF adjustment for staggered beacons */
-       enum nl80211_iftype av_opmode;
        struct ath_buf *av_bcbuf;
-       u8 bssid[ETH_ALEN]; /* current BSSID from config_interface */
 };
 
 /*******************/

diff --git a/drivers/net/wireless/ath/ath9k/beacon.c b/drivers/net/wireless/ath/ath9k/beacon.c
index f6885278398a76dbe1c76fd6bc693827c0a07c48..dfd1b98a086be081251c962738bc6ba60773c0c5 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/beacon.c
+++ b/drivers/net/wireless/ath/ath9k/beacon.c
@@ -323,6 +323,7 @@ void ath_beacon_return(struct ath_softc *sc, struct ath_vif *avp)
                if (avp->av_bslot != -1) {
                        sc->beacon.bslot[avp->av_bslot] = NULL;
                        sc->nbcnvifs--;
+                       avp->av_bslot = -1;
                }
 
                bf = avp->av_bcbuf;

diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
index 88073f4c2b6ab13640ddbf69ead070c8c23ab5be..6f300d7df88e36977485c4b2557ffc089ec17c75 100644 (file)
--- 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,
        struct ath_softc *sc = hw->priv;
        struct ath_hw *ah = sc->sc_ah;
        struct ath_common *common = ath9k_hw_common(ah);
-       struct ath_vif *avp = (void *)vif->drv_priv;
        int ret = 0;
 
        mutex_lock(&sc->mutex);
@@ -1491,10 +1490,6 @@ static int ath9k_add_interface(struct ieee80211_hw *hw,
        ath_dbg(common, ATH_DBG_CONFIG,
                "Attach a VIF of type: %d\n", vif->type);
 
-       /* Set the VIF opmode */
-       avp->av_opmode = vif->type;
-       avp->av_bslot = -1;
-
        sc->nvifs++;
 
        ath9k_do_vif_add_setup(hw, vif);
@@ -1910,7 +1905,6 @@ static void ath9k_bss_info_changed(struct ieee80211_hw *hw,
        if (changed & BSS_CHANGED_BSSID) {
                /* Set BSSID */
                memcpy(common->curbssid, bss_conf->bssid, ETH_ALEN);
-               memcpy(avp->bssid, bss_conf->bssid, ETH_ALEN);
                common->curaid = 0;
                ath9k_hw_write_associd(ah);