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

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

ath9k: Use beacon interval directly 



Setting up the CAB queue requires only the beacon interval,
remove the function ath_get_beaconconfig() which is redundant.

Signed-off-by: default avatarSujith <Sujith.Manoharan@atheros.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent f7a99e46

drivers/net/wireless/ath9k/xmit.c

+2 −17
Original line number Diff line number Diff line
@@ -772,19 +772,6 @@ bool ath_tx_aggr_check(struct ath_softc *sc, struct ath_node *an, u8 tidno) 
/* Queue Management */

/********************/



static void ath_get_beaconconfig(struct ath_softc *sc, int if_id,

				 struct ath_beacon_config *conf)

{

	struct ieee80211_hw *hw = sc->hw;



	/* fill in beacon config data */



	conf->beacon_interval = hw->conf.beacon_int;

	conf->listen_interval = 100;

	conf->dtim_count = 1;

	conf->bmiss_timeout = ATH_DEFAULT_BMISS_LIMIT * conf->listen_interval;

}



static void ath_txq_drain_pending_buffers(struct ath_softc *sc,

					  struct ath_txq *txq)

{
@@ -959,7 +946,6 @@ int ath_cabq_update(struct ath_softc *sc) 
{

	struct ath9k_tx_queue_info qi;

	int qnum = sc->beacon.cabq->axq_qnum;

	struct ath_beacon_config conf;



	ath9k_hw_get_txq_props(sc->sc_ah, qnum, &qi);

	/*
@@ -970,9 +956,8 @@ int ath_cabq_update(struct ath_softc *sc) 
	else if (sc->config.cabqReadytime > ATH9K_READY_TIME_HI_BOUND)

		sc->config.cabqReadytime = ATH9K_READY_TIME_HI_BOUND;



	ath_get_beaconconfig(sc, ATH_IF_ID_ANY, &conf);

	qi.tqi_readyTime =

		(conf.beacon_interval * sc->config.cabqReadytime) / 100;

	qi.tqi_readyTime = (sc->hw->conf.beacon_int *

			    sc->config.cabqReadytime) / 100;

	ath_txq_update(sc, qnum, &qi);



	return 0;