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

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

ath9k: Cleanup beacon queue configuration 



Setup the beacon queue parameters after disabling
interrupts. Also, remove the redundant call in conf_tx()
for IBSS mode since the queue would be configured
with the appropriate cwmin/cwmax values when beaconing
is enabled.

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

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

+0 −1
Original line number Diff line number Diff line
@@ -421,7 +421,6 @@ void ath9k_beacon_config(struct ath_softc *sc, struct ieee80211_vif *vif, 
			 u32 changed);

void ath9k_beacon_assign_slot(struct ath_softc *sc, struct ieee80211_vif *vif);

void ath9k_beacon_remove_slot(struct ath_softc *sc, struct ieee80211_vif *vif);

int ath_beaconq_config(struct ath_softc *sc);

void ath9k_set_beacon(struct ath_softc *sc);

void ath9k_set_beaconing_status(struct ath_softc *sc, bool status);

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

+4 −7
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ static void ath9k_reset_beacon_status(struct ath_softc *sc) 
 *  the operating mode of the station (AP or AdHoc).  Parameters are AIFS

 *  settings and channel width min/max

*/

int ath_beaconq_config(struct ath_softc *sc)

static void ath9k_beaconq_config(struct ath_softc *sc)

{

	struct ath_hw *ah = sc->sc_ah;

	struct ath_common *common = ath9k_hw_common(ah);
@@ -38,6 +38,7 @@ int ath_beaconq_config(struct ath_softc *sc) 
	struct ath_txq *txq;



	ath9k_hw_get_txq_props(ah, sc->beacon.beaconq, &qi);



	if (sc->sc_ah->opmode == NL80211_IFTYPE_AP) {

		/* Always burst out beacon and CAB traffic. */

		qi.tqi_aifs = 1;
@@ -56,12 +57,9 @@ int ath_beaconq_config(struct ath_softc *sc) 
	}



	if (!ath9k_hw_set_txq_props(ah, sc->beacon.beaconq, &qi)) {

		ath_err(common,

			"Unable to update h/w beacon queue parameters\n");

		return 0;

		ath_err(common, "Unable to update h/w beacon queue parameters\n");

	} else {

		ath9k_hw_resettxqueue(ah, sc->beacon.beaconq);

		return 1;

	}

}
@@ -401,6 +399,7 @@ static void ath9k_beacon_init(struct ath_softc *sc, u32 nexttbtt, u32 intval) 


	ath9k_hw_disable_interrupts(ah);

	ath9k_hw_reset_tsf(ah);

	ath9k_beaconq_config(sc);

	ath9k_hw_beaconinit(ah, nexttbtt, intval);

	sc->beacon.bmisscnt = 0;

	ath9k_hw_set_interrupts(ah);
@@ -432,7 +431,6 @@ static void ath9k_beacon_config_ap(struct ath_softc *sc, 
	ath_dbg(common, BEACON, "AP nexttbtt: %u intval: %u conf_intval: %u\n",

		nexttbtt, intval, conf->beacon_interval);



	ath_beaconq_config(sc);

	ath9k_beacon_init(sc, nexttbtt, intval);

}
@@ -584,7 +582,6 @@ static void ath9k_beacon_config_adhoc(struct ath_softc *sc, 
	ath_dbg(common, BEACON, "IBSS nexttbtt: %u intval: %u conf_intval: %u\n",

		nexttbtt, intval, conf->beacon_interval);



	ath_beaconq_config(sc);

	ath9k_beacon_init(sc, nexttbtt, intval);

}

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

+0 −4
Original line number Diff line number Diff line
@@ -1359,10 +1359,6 @@ static int ath9k_conf_tx(struct ieee80211_hw *hw, 
	if (ret)

		ath_err(common, "TXQ Update failed\n");



	if (sc->sc_ah->opmode == NL80211_IFTYPE_ADHOC)

		if (queue == WME_AC_BE && !ret)

			ath_beaconq_config(sc);



	mutex_unlock(&sc->mutex);

	ath9k_ps_restore(sc);

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

+0 −10
Original line number Diff line number Diff line
@@ -1416,16 +1416,6 @@ int ath_txq_update(struct ath_softc *sc, int qnum, 
	int error = 0;

	struct ath9k_tx_queue_info qi;



	if (qnum == sc->beacon.beaconq) {

		/*

		 * XXX: for beacon queue, we just save the parameter.

		 * It will be picked up by ath_beaconq_config when

		 * it's necessary.

		 */

		sc->beacon.beacon_qi = *qinfo;

		return 0;

	}



	BUG_ON(sc->tx.txq[qnum].axq_qnum != qnum);



	ath9k_hw_get_txq_props(ah, qnum, &qi);