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

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

ath9k: Fix interface accounting 



Currently, the interface count is maintained globally,
but this causes problems in RX filter calculation.
Make the interface count a per-channel-context variable
to fix this.

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

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

+1 −1
Original line number Diff line number Diff line
@@ -350,6 +350,7 @@ struct ath_chanctx { 
	bool assigned;

	bool switch_after_beacon;



	short nvifs;

	unsigned int rxfilter;

};
@@ -963,7 +964,6 @@ struct ath_softc { 
	bool ps_enabled;

	bool ps_idle;

	short nbcnvifs;

	short nvifs;

	unsigned long ps_usecount;



	struct ath_rx rx;

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

+1 −1
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ static struct ath_buf *ath9k_beacon_generate(struct ieee80211_hw *hw, 
	spin_unlock_bh(&cabq->axq_lock);



	if (skb && cabq_depth) {

		if (sc->nvifs > 1) {

		if (sc->cur_chan->nvifs > 1) {

			ath_dbg(common, BEACON,

				"Flushing previous cabq traffic\n");

			ath_draintxq(sc, cabq);

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

+1 −1
Original line number Diff line number Diff line
@@ -838,7 +838,7 @@ static ssize_t read_file_misc(struct file *file, char __user *user_buf, 
			iter_data.nmeshes, iter_data.nwds);

		len += scnprintf(buf + len, sizeof(buf) - len,

			" ADHOC: %i TOTAL: %hi BEACON-VIF: %hi\n",

			iter_data.nadhocs, sc->nvifs, sc->nbcnvifs);

			iter_data.nadhocs, sc->cur_chan->nvifs, sc->nbcnvifs);

	}



	if (len > sizeof(buf))

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

+3 −3
Original line number Diff line number Diff line
@@ -1117,7 +1117,7 @@ static int ath9k_add_interface(struct ieee80211_hw *hw, 
	mutex_lock(&sc->mutex);



	if (config_enabled(CONFIG_ATH9K_TX99)) {

		if (sc->nvifs >= 1) {

		if (sc->cur_chan->nvifs >= 1) {

			mutex_unlock(&sc->mutex);

			return -EOPNOTSUPP;

		}
@@ -1125,7 +1125,7 @@ static int ath9k_add_interface(struct ieee80211_hw *hw, 
	}



	ath_dbg(common, CONFIG, "Attach a VIF of type: %d\n", vif->type);

	sc->nvifs++;

	sc->cur_chan->nvifs++;



	if (ath9k_uses_beacons(vif->type))

		ath9k_beacon_assign_slot(sc, vif);
@@ -1207,7 +1207,7 @@ static void ath9k_remove_interface(struct ieee80211_hw *hw, 


	ath9k_p2p_remove_vif(sc, vif);



	sc->nvifs--;

	sc->cur_chan->nvifs--;

	sc->tx99_vif = NULL;

	if (!ath9k_is_chanctx_enabled())

		list_del(&avp->list);

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

+2 −2
Original line number Diff line number Diff line
@@ -404,7 +404,7 @@ u32 ath_calcrxfilter(struct ath_softc *sc) 
		rfilt |= ATH9K_RX_FILTER_CONTROL;



	if ((sc->sc_ah->opmode == NL80211_IFTYPE_STATION) &&

	    (sc->nvifs <= 1) &&

	    (sc->cur_chan->nvifs <= 1) &&

	    !(sc->cur_chan->rxfilter & FIF_BCN_PRBRESP_PROMISC))

		rfilt |= ATH9K_RX_FILTER_MYBEACON;

	else
@@ -417,7 +417,7 @@ u32 ath_calcrxfilter(struct ath_softc *sc) 
	if (sc->cur_chandef.width != NL80211_CHAN_WIDTH_20_NOHT)

		rfilt |= ATH9K_RX_FILTER_COMP_BAR;



	if (sc->nvifs > 1 || (sc->cur_chan->rxfilter & FIF_OTHER_BSS)) {

	if (sc->cur_chan->nvifs > 1 || (sc->cur_chan->rxfilter & FIF_OTHER_BSS)) {

		/* This is needed for older chips */

		if (sc->sc_ah->hw_version.macVersion <= AR_SREV_VERSION_9160)

			rfilt |= ATH9K_RX_FILTER_PROM;