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

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

ath9k: Add ath9k_offchannel_init 



This patch adds a routine to setup the offchannel
instance in ath_softc.

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

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

+4 −0
Original line number Diff line number Diff line
@@ -423,6 +423,7 @@ void ath_chanctx_check_active(struct ath_softc *sc, struct ath_chanctx *ctx); 
bool ath9k_is_chanctx_enabled(void);

void ath9k_fill_chanctx_ops(void);

void ath9k_init_channel_context(struct ath_softc *sc);

void ath9k_offchannel_init(struct ath_softc *sc);

void ath9k_deinit_channel_context(struct ath_softc *sc);

int ath9k_init_p2p(struct ath_softc *sc);

void ath9k_deinit_p2p(struct ath_softc *sc);
@@ -455,6 +456,9 @@ static inline void ath9k_fill_chanctx_ops(void) 
static inline void ath9k_init_channel_context(struct ath_softc *sc)

{

}

static inline void ath9k_offchannel_init(struct ath_softc *sc)

{

}

static inline void ath9k_deinit_channel_context(struct ath_softc *sc)

{

}

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

+25 −8
Original line number Diff line number Diff line
@@ -167,14 +167,6 @@ void ath_chanctx_init(struct ath_softc *sc) 
		for (j = 0; j < ARRAY_SIZE(ctx->acq); j++)

			INIT_LIST_HEAD(&ctx->acq[j]);

	}

	ctx = &sc->offchannel.chan;

	cfg80211_chandef_create(&ctx->chandef, chan, NL80211_CHAN_HT20);

	INIT_LIST_HEAD(&ctx->vifs);

	ctx->txpower = ATH_TXPOWER_MAX;

	for (j = 0; j < ARRAY_SIZE(ctx->acq); j++)

		INIT_LIST_HEAD(&ctx->acq[j]);

	sc->offchannel.chan.offchannel = true;



}



void ath_chanctx_set_channel(struct ath_softc *sc, struct ath_chanctx *ctx,
@@ -942,6 +934,31 @@ static void ath_chanctx_work(struct work_struct *work) 
	mutex_unlock(&sc->mutex);

}



void ath9k_offchannel_init(struct ath_softc *sc)

{

	struct ath_chanctx *ctx;

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

	struct ieee80211_supported_band *sband;

	struct ieee80211_channel *chan;

	int i;



	sband = &common->sbands[IEEE80211_BAND_2GHZ];

	if (!sband->n_channels)

		sband = &common->sbands[IEEE80211_BAND_5GHZ];



	chan = &sband->channels[0];



	ctx = &sc->offchannel.chan;

	INIT_LIST_HEAD(&ctx->vifs);

	ctx->txpower = ATH_TXPOWER_MAX;

	cfg80211_chandef_create(&ctx->chandef, chan, NL80211_CHAN_HT20);



	for (i = 0; i < ARRAY_SIZE(ctx->acq); i++)

		INIT_LIST_HEAD(&ctx->acq[i]);



	sc->offchannel.chan.offchannel = true;

}



void ath9k_init_channel_context(struct ath_softc *sc)

{

	INIT_WORK(&sc->chanctx_work, ath_chanctx_work);

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

+1 −0
Original line number Diff line number Diff line
@@ -610,6 +610,7 @@ static int ath9k_init_softc(u16 devid, struct ath_softc *sc, 
	ath9k_init_misc(sc);

	ath_fill_led_pin(sc);

	ath_chanctx_init(sc);

	ath9k_offchannel_init(sc);



	if (common->bus_ops->aspm_init)

		common->bus_ops->aspm_init(common);