From mboxrd@z Thu Jan 1 00:00:00 1970 From: Benjamin Berg Date: Fri, 13 Mar 2015 16:37:02 +0100 Subject: [ath9k-devel] [PATCH] ath9k: Configure beacons for AP vif if this has not happened yet In-Reply-To: <5502F3C7.1090005@openwrt.org> References: <1426253587-11397-1-git-send-email-benjamin@sipsolutions.net> <5502F3C7.1090005@openwrt.org> Message-ID: <1426261022.3238.43.camel@sipsolutions.net> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: ath9k-devel@lists.ath9k.org On Fr, 2015-03-13 at 15:27 +0100, Felix Fietkau wrote: > I sent the following patch yesterday - I think it addresses the exact > same issue. Please test it to see if it works for you as well. The patch looks a lot better. I just backported it and it is working just fine for me. Benjamin > Subject: [PATCH 4.0] ath9k: fix tracking of enabled AP beacons > > sc->nbcnvifs tracks assigned beacon slots, not enabled beacons. > Therefore, it cannot be used to decide if cur_conf->enable_beacon (bool) > should be updated, or if beacons have been enabled already. > With the current code (depending on the order of calls), beacons often > do not get enabled in an AP+STA setup. > To fix tracking of enabled beacons, convert cur_conf->enable_beacon to a > bitmask of enabled beacon slots. > > Cc: stable at vger.kernel.org > Signed-off-by: Felix Fietkau > --- > drivers/net/wireless/ath/ath9k/beacon.c | 20 ++++++++++++-------- > drivers/net/wireless/ath/ath9k/common.h | 2 +- > 2 files changed, 13 insertions(+), 9 deletions(-) > > diff --git a/drivers/net/wireless/ath/ath9k/beacon.c b/drivers/net/wireless/ath/ath9k/beacon.c > index cb366ad..f50a6bc 100644 > --- a/drivers/net/wireless/ath/ath9k/beacon.c > +++ b/drivers/net/wireless/ath/ath9k/beacon.c > @@ -219,12 +219,15 @@ void ath9k_beacon_remove_slot(struct ath_softc *sc, struct ieee80211_vif *vif) > struct ath_common *common = ath9k_hw_common(sc->sc_ah); > struct ath_vif *avp = (void *)vif->drv_priv; > struct ath_buf *bf = avp->av_bcbuf; > + struct ath_beacon_config *cur_conf = &sc->cur_chan->beacon; > > ath_dbg(common, CONFIG, "Removing interface at beacon slot: %d\n", > avp->av_bslot); > > tasklet_disable(&sc->bcon_tasklet); > > + cur_conf->enable_beacon &= ~BIT(avp->av_bslot); > + > if (bf && bf->bf_mpdu) { > struct sk_buff *skb = bf->bf_mpdu; > dma_unmap_single(sc->dev, bf->bf_buf_addr, > @@ -521,8 +524,7 @@ static bool ath9k_allow_beacon_config(struct ath_softc *sc, > } > > if (sc->sc_ah->opmode == NL80211_IFTYPE_AP) { > - if ((vif->type != NL80211_IFTYPE_AP) || > - (sc->nbcnvifs > 1)) { > + if (vif->type != NL80211_IFTYPE_AP) { > ath_dbg(common, CONFIG, > "An AP interface is already present !\n"); > return false; > @@ -616,12 +618,14 @@ void ath9k_beacon_config(struct ath_softc *sc, struct ieee80211_vif *vif, > * enabling/disabling SWBA. > */ > if (changed & BSS_CHANGED_BEACON_ENABLED) { > - if (!bss_conf->enable_beacon && > - (sc->nbcnvifs <= 1)) { > - cur_conf->enable_beacon = false; > - } else if (bss_conf->enable_beacon) { > - cur_conf->enable_beacon = true; > - ath9k_cache_beacon_config(sc, ctx, bss_conf); > + bool enabled = cur_conf->enable_beacon; > + > + if (!bss_conf->enable_beacon) { > + cur_conf->enable_beacon &= ~BIT(avp->av_bslot); > + } else { > + cur_conf->enable_beacon |= BIT(avp->av_bslot); > + if (!enabled) > + ath9k_cache_beacon_config(sc, ctx, bss_conf); > } > } > > diff --git a/drivers/net/wireless/ath/ath9k/common.h b/drivers/net/wireless/ath/ath9k/common.h > index 2b79a56..d237373 100644 > --- a/drivers/net/wireless/ath/ath9k/common.h > +++ b/drivers/net/wireless/ath/ath9k/common.h > @@ -54,7 +54,7 @@ struct ath_beacon_config { > u16 dtim_period; > u16 bmiss_timeout; > u8 dtim_count; > - bool enable_beacon; > + u8 enable_beacon; > bool ibss_creator; > u32 nexttbtt; > u32 intval; > -- 2.2.2 -- > -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 181 bytes Desc: This is a digitally signed message part Url : http://lists.ath9k.org/pipermail/ath9k-devel/attachments/20150313/3efb06f4/attachment-0001.pgp