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

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

ath9k: Make ath_chanctx_get_oper_chan static 



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

drivers/net/wireless/ath/ath9k/ath9k.h

+0 −2
Original line number Diff line number Diff line
@@ -420,8 +420,6 @@ void ath_chanctx_set_channel(struct ath_softc *sc, struct ath_chanctx *ctx, 
void ath_chanctx_switch(struct ath_softc *sc, struct ath_chanctx *ctx,

			struct cfg80211_chan_def *chandef);

void ath_chanctx_check_active(struct ath_softc *sc, struct ath_chanctx *ctx);

struct ath_chanctx *ath_chanctx_get_oper_chan(struct ath_softc *sc,

					      bool active);

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

		       enum ath_chanctx_event ev);

void ath_offchannel_next(struct ath_softc *sc);

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

+18 −17
Original line number Diff line number Diff line
@@ -227,23 +227,6 @@ void ath_chanctx_set_channel(struct ath_softc *sc, struct ath_chanctx *ctx, 
	ath_set_channel(sc);

}



struct ath_chanctx *ath_chanctx_get_oper_chan(struct ath_softc *sc, bool active)

{

	struct ath_chanctx *ctx;



	ath_for_each_chanctx(sc, ctx) {

		if (!ctx->assigned || list_empty(&ctx->vifs))

			continue;

		if (active && !ctx->active)

			continue;



		if (ctx->switch_after_beacon)

			return ctx;

	}



	return &sc->chanctx[0];

}



static struct ath_chanctx *

ath_chanctx_get_next(struct ath_softc *sc, struct ath_chanctx *ctx)

{
@@ -537,6 +520,24 @@ static void ath_chanctx_offchan_switch(struct ath_softc *sc, 
	ath_chanctx_switch(sc, &sc->offchannel.chan, &chandef);

}



static struct ath_chanctx *ath_chanctx_get_oper_chan(struct ath_softc *sc,

						     bool active)

{

	struct ath_chanctx *ctx;



	ath_for_each_chanctx(sc, ctx) {

		if (!ctx->assigned || list_empty(&ctx->vifs))

			continue;

		if (active && !ctx->active)

			continue;



		if (ctx->switch_after_beacon)

			return ctx;

	}



	return &sc->chanctx[0];

}



static void

ath_scan_next_channel(struct ath_softc *sc)

{