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

Commit ca900ac9 authored by Rajkumar Manoharan's avatar Rajkumar Manoharan Committed by John W. Linville
Browse files

ath9k: Move beacon config to channel context 



Signed-off-by: default avatarRajkumar Manoharan <rmanohar@qti.qualcomm.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 8d7e09dd

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

+1 −1
Original line number Diff line number Diff line
@@ -328,6 +328,7 @@ struct ath_chanctx { 
	struct list_head vifs;

	struct list_head acq[IEEE80211_NUM_ACS];



	struct ath_beacon_config beacon;

	struct ath9k_hw_cal_data caldata;

	struct timespec tsf_ts;

	u64 tsf_val;
@@ -828,7 +829,6 @@ struct ath_softc { 
#ifdef CONFIG_ATH9K_DEBUGFS

	struct ath9k_debug debug;

#endif

	struct ath_beacon_config cur_beacon_conf;

	struct delayed_work tx_complete_work;

	struct delayed_work hw_pll_work;

	struct timer_list sleep_timer;

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

+5 −5
Original line number Diff line number Diff line
@@ -249,7 +249,7 @@ void ath9k_beacon_remove_slot(struct ath_softc *sc, struct ieee80211_vif *vif) 
static int ath9k_beacon_choose_slot(struct ath_softc *sc)

{

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

	struct ath_beacon_config *cur_conf = &sc->cur_beacon_conf;

	struct ath_beacon_config *cur_conf = &sc->cur_chan->beacon;

	u16 intval;

	u32 tsftu;

	u64 tsf;
@@ -277,7 +277,7 @@ static int ath9k_beacon_choose_slot(struct ath_softc *sc) 
static void ath9k_set_tsfadjust(struct ath_softc *sc, struct ieee80211_vif *vif)

{

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

	struct ath_beacon_config *cur_conf = &sc->cur_beacon_conf;

	struct ath_beacon_config *cur_conf = &sc->cur_chan->beacon;

	struct ath_vif *avp = (void *)vif->drv_priv;

	u32 tsfadjust;
@@ -528,7 +528,7 @@ static void ath9k_cache_beacon_config(struct ath_softc *sc, 
				      struct ieee80211_bss_conf *bss_conf)

{

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

	struct ath_beacon_config *cur_conf = &sc->cur_beacon_conf;

	struct ath_beacon_config *cur_conf = &sc->cur_chan->beacon;



	ath_dbg(common, BEACON,

		"Caching beacon data for BSS: %pM\n", bss_conf->bssid);
@@ -564,7 +564,7 @@ void ath9k_beacon_config(struct ath_softc *sc, struct ieee80211_vif *vif, 
			 u32 changed)

{

	struct ieee80211_bss_conf *bss_conf = &vif->bss_conf;

	struct ath_beacon_config *cur_conf = &sc->cur_beacon_conf;

	struct ath_beacon_config *cur_conf = &sc->cur_chan->beacon;

        struct ath_hw *ah = sc->sc_ah;

        struct ath_common *common = ath9k_hw_common(ah);

	unsigned long flags;
@@ -631,7 +631,7 @@ void ath9k_beacon_config(struct ath_softc *sc, struct ieee80211_vif *vif, 
void ath9k_set_beacon(struct ath_softc *sc)

{

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

	struct ath_beacon_config *cur_conf = &sc->cur_beacon_conf;

	struct ath_beacon_config *cur_conf = &sc->cur_chan->beacon;



	switch (sc->sc_ah->opmode) {

	case NL80211_IFTYPE_AP:

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

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

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

	}

	sc->cur_chan = &sc->chanctx[0];

	ctx = &sc->offchannel.chan;

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

	INIT_LIST_HEAD(&ctx->vifs);

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

+1 −0
Original line number Diff line number Diff line
@@ -510,6 +510,7 @@ static int ath9k_init_softc(u16 devid, struct ath_softc *sc, 
	sc->dfs_detector = dfs_pattern_detector_init(common, NL80211_DFS_UNSET);

	sc->tx99_power = MAX_RATE_POWER + 1;

	init_waitqueue_head(&sc->tx_wait);

	sc->cur_chan = &sc->chanctx[0];



	if (!pdata || pdata->use_eeprom) {

		ah->ah_flags |= AH_USE_EEPROM;

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

+1 −1
Original line number Diff line number Diff line
@@ -440,7 +440,7 @@ void ath_check_ani(struct ath_softc *sc) 
{

	struct ath_hw *ah = sc->sc_ah;

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

	struct ath_beacon_config *cur_conf = &sc->cur_beacon_conf;

	struct ath_beacon_config *cur_conf = &sc->cur_chan->beacon;



	/*

	 * Check for the various conditions in which ANI has to