leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ath9k: Remove is_bslot_active

Browse Source 
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>
This commit is contained in:
Sujith Manoharan 2012-07-17 17:16:03 +05:30 committed by John W. Linville
parent ef4ad63368
commit aa45fe9683
3 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/wireless/ath/ath9k/ath9k.h
View File

@ -363,7 +363,7 @@ void ath_tx_aggr_sleep(struct ieee80211_sta *sta, struct ath_softc *sc,
struct ath_vif { struct ath_vif {
int av_bslot; int av_bslot;
bool is_bslot_active, primary_sta_vif; bool primary_sta_vif;
__le64 tsf_adjust; /* TSF adjustment for staggered beacons */ __le64 tsf_adjust; /* TSF adjustment for staggered beacons */
struct ath_buf *av_bcbuf; struct ath_buf *av_bcbuf;
}; };

15
drivers/net/wireless/ath/ath9k/beacon.c
View File

@ -134,20 +134,17 @@ static struct ath_buf *ath_beacon_generate(struct ieee80211_hw *hw,
struct ath_softc *sc = hw->priv; struct ath_softc *sc = hw->priv;
struct ath_common *common = ath9k_hw_common(sc->sc_ah); struct ath_common *common = ath9k_hw_common(sc->sc_ah);
struct ath_buf *bf; struct ath_buf *bf;
struct ath_vif *avp; struct ath_vif *avp = (void *)vif->drv_priv;
struct sk_buff *skb; struct sk_buff *skb;
struct ath_txq *cabq; struct ath_txq *cabq = sc->beacon.cabq;
struct ieee80211_tx_info *info; struct ieee80211_tx_info *info;
int cabq_depth; int cabq_depth;
ath9k_reset_beacon_status(sc); if (avp->av_bcbuf == NULL)
avp = (void *)vif->drv_priv;
cabq = sc->beacon.cabq;
if ((avp->av_bcbuf == NULL) || !avp->is_bslot_active)
return NULL; return NULL;
ath9k_reset_beacon_status(sc);
/* Release the old beacon first */ /* Release the old beacon first */
bf = avp->av_bcbuf; 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++) { for (slot = 0; slot < ATH_BCBUF; slot++) {
if (sc->beacon.bslot[slot] == NULL) { if (sc->beacon.bslot[slot] == NULL) {
avp->av_bslot = slot; avp->av_bslot = slot;
avp->is_bslot_active = false;
break; break;
} }
} }
@ -267,7 +263,6 @@ void ath9k_beacon_remove_slot(struct ath_softc *sc, struct ieee80211_vif *vif)
} }
avp->av_bcbuf = NULL; avp->av_bcbuf = NULL;
avp->is_bslot_active = false;
sc->beacon.bslot[avp->av_bslot] = NULL; sc->beacon.bslot[avp->av_bslot] = NULL;
sc->nbcnvifs--; sc->nbcnvifs--;
list_add_tail(&bf->list, &sc->beacon.bbuf); list_add_tail(&bf->list, &sc->beacon.bbuf);

5
drivers/net/wireless/ath/ath9k/main.c
View File

@ -1788,10 +1788,11 @@ static int ath9k_tx_last_beacon(struct ieee80211_hw *hw)
if (!vif) if (!vif)
return 0; return 0;
avp = (void *)vif->drv_priv; if (!vif->bss_conf.enable_beacon)
if (!avp->is_bslot_active)
return 0; return 0;
avp = (void *)vif->drv_priv;
if (!sc->beacon.tx_processed && !edma) { if (!sc->beacon.tx_processed && !edma) {
tasklet_disable(&sc->bcon_tasklet); tasklet_disable(&sc->bcon_tasklet);