diff options
| author |   Felix Fietkau <nbd@openwrt.org> | 2010-05-13 20:37:24 +0200 |
|---|---|---|
| committer |   John W. Linville <linville@tuxdriver.com> | 2010-05-25 11:12:54 -0400 |
| commit | 774610e4f26cb3d9da14a8b5974324c9e51017bd (patch) | |
| tree | 418441d85667352270052c98da4a26ae8d878eca | |
| parent | ath9k: Fix rx of mcast/bcast frames in PS mode with auto sleep (diff) | |
| download | linux-dev-774610e4f26cb3d9da14a8b5974324c9e51017bd.tar.xz linux-dev-774610e4f26cb3d9da14a8b5974324c9e51017bd.zip | |
ath9k: change beacon allocation to prefer the first beacon slot
This fixes IBSS beacon transmissions without VEOL enabled
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/beacon.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/drivers/net/wireless/ath/ath9k/beacon.c b/drivers/net/wireless/ath/ath9k/beacon.c index c8a4558f79ba..77face76e05f 100644 --- a/drivers/net/wireless/ath/ath9k/beacon.c +++ b/drivers/net/wireless/ath/ath9k/beacon.c @@ -274,17 +274,11 @@ int ath_beacon_alloc(struct ath_wiphy *aphy, struct ieee80211_vif *vif) avp->av_bslot = 0; for (slot = 0; slot < ATH_BCBUF; slot++) if (sc->beacon.bslot[slot] == NULL) { - /* - * XXX hack, space out slots to better - * deal with misses - */ - if (slot+1 < ATH_BCBUF && - sc->beacon.bslot[slot+1] == NULL) { - avp->av_bslot = slot+1; - break; - } avp->av_bslot = slot; + /* NB: keep looking for a double slot */ + if (slot == 0 || !sc->beacon.bslot[slot-1]) + break; } BUG_ON(sc->beacon.bslot[avp->av_bslot] != NULL); sc->beacon.bslot[avp->av_bslot] = vif; |