ath9k: Remove is_bslot_active

In the tx_last_beacon() callback, mac80211's beaconing
status can be used instead. The beacon tasklet doesn't require
it because it is disabled when removing a slot.

Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.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 4cce997d686791b1e726d46150ef42da3bc2022e..f74640cbdbf67cfff5f8c76788b88bb682afa682 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/ath9k.h
+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
@@ -363,7 +363,7 @@ void ath_tx_aggr_sleep(struct ieee80211_sta *sta, struct ath_softc *sc,
 
 struct ath_vif {
        int av_bslot;
-       bool is_bslot_active, primary_sta_vif;
+       bool primary_sta_vif;
        __le64 tsf_adjust; /* TSF adjustment for staggered beacons */
        struct ath_buf *av_bcbuf;
 };

diff --git a/drivers/net/wireless/ath/ath9k/beacon.c b/drivers/net/wireless/ath/ath9k/beacon.c
index a79ec4572c2f06a6f66dd6afb90062458bd9e61d..2962b3e928d8208ea23f898ec950fc8ce455b54f 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/beacon.c
+++ b/drivers/net/wireless/ath/ath9k/beacon.c
@@ -134,20 +134,17 @@ static struct ath_buf *ath_beacon_generate(struct ieee80211_hw *hw,
        struct ath_softc *sc = hw->priv;
        struct ath_common *common = ath9k_hw_common(sc->sc_ah);
        struct ath_buf *bf;
-       struct ath_vif *avp;
+       struct ath_vif *avp = (void *)vif->drv_priv;
        struct sk_buff *skb;
-       struct ath_txq *cabq;
+       struct ath_txq *cabq = sc->beacon.cabq;
        struct ieee80211_tx_info *info;
        int cabq_depth;
 
-       ath9k_reset_beacon_status(sc);
-
-       avp = (void *)vif->drv_priv;
-       cabq = sc->beacon.cabq;
-
-       if ((avp->av_bcbuf == NULL) || !avp->is_bslot_active)
+       if (avp->av_bcbuf == NULL)
                return NULL;
 
+       ath9k_reset_beacon_status(sc);
+
        /* Release the old beacon first */
 
        bf = avp->av_bcbuf;
@@ -234,7 +231,6 @@ void ath9k_beacon_assign_slot(struct ath_softc *sc, struct ieee80211_vif *vif)
        for (slot = 0; slot < ATH_BCBUF; slot++) {
                if (sc->beacon.bslot[slot] == NULL) {
                        avp->av_bslot = slot;
-                       avp->is_bslot_active = false;
                        break;
                }
        }
@@ -267,7 +263,6 @@ void ath9k_beacon_remove_slot(struct ath_softc *sc, struct ieee80211_vif *vif)
        }
 
        avp->av_bcbuf = NULL;
-       avp->is_bslot_active = false;
        sc->beacon.bslot[avp->av_bslot] = NULL;
        sc->nbcnvifs--;
        list_add_tail(&bf->list, &sc->beacon.bbuf);

diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
index e411189abd7dc2e0bd343629c8abee7523ef4ec7..fa97facf779552d97d2e39e2cfce2d042eca9846 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
@@ -1788,10 +1788,11 @@ static int ath9k_tx_last_beacon(struct ieee80211_hw *hw)
        if (!vif)
                return 0;
 
-       avp = (void *)vif->drv_priv;
-       if (!avp->is_bslot_active)
+       if (!vif->bss_conf.enable_beacon)
                return 0;
 
+       avp = (void *)vif->drv_priv;
+
        if (!sc->beacon.tx_processed && !edma) {
                tasklet_disable(&sc->bcon_tasklet);