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

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

ath9k: Make ath_chanctx_offchan_switch static 



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

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);

void ath_chanctx_offchan_switch(struct ath_softc *sc,

				struct ieee80211_channel *chan);

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,

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

+13 −13
Original line number Diff line number Diff line
@@ -244,19 +244,6 @@ struct ath_chanctx *ath_chanctx_get_oper_chan(struct ath_softc *sc, bool active) 
	return &sc->chanctx[0];

}



void ath_chanctx_offchan_switch(struct ath_softc *sc,

				struct ieee80211_channel *chan)

{

	struct ath_common *common = ath9k_hw_common(sc->sc_ah);

	struct cfg80211_chan_def chandef;



	cfg80211_chandef_create(&chandef, chan, NL80211_CHAN_NO_HT);

	ath_dbg(common, CHAN_CTX,

		"Channel definition created: %d MHz\n", chandef.center_freq1);



	ath_chanctx_switch(sc, &sc->offchannel.chan, &chandef);

}



static struct ath_chanctx *

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

{
@@ -537,6 +524,19 @@ static int ath_scan_channel_duration(struct ath_softc *sc, 
	return (HZ / 16); /* ~60 ms */

}



static void ath_chanctx_offchan_switch(struct ath_softc *sc,

				       struct ieee80211_channel *chan)

{

	struct ath_common *common = ath9k_hw_common(sc->sc_ah);

	struct cfg80211_chan_def chandef;



	cfg80211_chandef_create(&chandef, chan, NL80211_CHAN_NO_HT);

	ath_dbg(common, CHAN_CTX,

		"Channel definition created: %d MHz\n", chandef.center_freq1);



	ath_chanctx_switch(sc, &sc->offchannel.chan, &chandef);

}



static void

ath_scan_next_channel(struct ath_softc *sc)

{