| 1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768 |
- From: Sujith Manoharan <[email protected]>
- Date: Fri, 17 Oct 2014 07:40:23 +0530
- Subject: [PATCH] ath9k: Use a helper function for offchannel NoA
- Signed-off-by: Sujith Manoharan <[email protected]>
- ---
- --- a/drivers/net/wireless/ath/ath9k/channel.c
- +++ b/drivers/net/wireless/ath/ath9k/channel.c
- @@ -366,6 +366,32 @@ static void ath_chanctx_setup_timer(stru
- "Setup chanctx timer with timeout: %d ms\n", jiffies_to_msecs(tsf_time));
- }
-
- +static void ath_chanctx_offchannel_noa(struct ath_softc *sc,
- + struct ath_chanctx *ctx,
- + struct ath_vif *avp,
- + u32 tsf_time)
- +{
- + struct ath_common *common = ath9k_hw_common(sc->sc_ah);
- +
- + avp->noa_index++;
- + avp->offchannel_start = tsf_time;
- + avp->offchannel_duration = sc->sched.offchannel_duration;
- +
- + ath_dbg(common, CHAN_CTX,
- + "offchannel noa_duration: %d, noa_start: %d, noa_index: %d\n",
- + avp->offchannel_duration,
- + avp->offchannel_start,
- + avp->noa_index);
- +
- + /*
- + * When multiple contexts are active, the NoA
- + * has to be recalculated and advertised after
- + * an offchannel operation.
- + */
- + if (ctx->active && avp->noa_duration)
- + avp->noa_duration = 0;
- +}
- +
- void ath_chanctx_event(struct ath_softc *sc, struct ieee80211_vif *vif,
- enum ath_chanctx_event ev)
- {
- @@ -461,24 +487,7 @@ void ath_chanctx_event(struct ath_softc
- * values and increment the index.
- */
- if (sc->next_chan == &sc->offchannel.chan) {
- - avp->noa_index++;
- - avp->offchannel_start = tsf_time;
- - avp->offchannel_duration = sc->sched.offchannel_duration;
- -
- - ath_dbg(common, CHAN_CTX,
- - "offchannel noa_duration: %d, noa_start: %d, noa_index: %d\n",
- - avp->offchannel_duration,
- - avp->offchannel_start,
- - avp->noa_index);
- -
- - /*
- - * When multiple contexts are active, the NoA
- - * has to be recalculated and advertised after
- - * an offchannel operation.
- - */
- - if (ctx->active && avp->noa_duration)
- - avp->noa_duration = 0;
- -
- + ath_chanctx_offchannel_noa(sc, ctx, avp, tsf_time);
- break;
- }
-
|
