Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a23152a8 authored by Sujith Manoharan's avatar Sujith Manoharan Committed by John W. Linville
Browse files

ath9k: Use a helper function for offchannel NoA 



Signed-off-by: default avatarSujith Manoharan <c_manoha@qca.qualcomm.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent c6500ea2

drivers/net/wireless/ath/ath9k/channel.c

+27 −18
Original line number Original line Diff line number Diff line
@@ -366,6 +366,32 @@ static void ath_chanctx_setup_timer(struct ath_softc *sc, u32 tsf_time) 
		"Setup chanctx timer with timeout: %d ms\n", jiffies_to_msecs(tsf_time));

		"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,

void ath_chanctx_event(struct ath_softc *sc, struct ieee80211_vif *vif,

		       enum ath_chanctx_event ev)

		       enum ath_chanctx_event ev)

{

{
@@ -461,24 +487,7 @@ void ath_chanctx_event(struct ath_softc *sc, struct ieee80211_vif *vif, 
		 * values and increment the index.

		 * values and increment the index.

		 */

		 */

		if (sc->next_chan == &sc->offchannel.chan) {

		if (sc->next_chan == &sc->offchannel.chan) {

			avp->noa_index++;

			ath_chanctx_offchannel_noa(sc, ctx, avp, tsf_time);

			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;



			break;

			break;

		}

		}