ath9k: remove sc->config.cabqReadyTime
It is not exposed as a configuration option anyway Signed-off-by: Felix Fietkau <nbd@openwrt.org> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
parent
45c67f6fec
commit
7f329bbb3d
|
@ -64,7 +64,6 @@ struct ath_node;
|
||||||
|
|
||||||
struct ath_config {
|
struct ath_config {
|
||||||
u16 txpowlimit;
|
u16 txpowlimit;
|
||||||
u8 cabqReadytime;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
/*************************/
|
/*************************/
|
||||||
|
|
|
@ -471,7 +471,6 @@ static int ath9k_init_queues(struct ath_softc *sc)
|
||||||
sc->beacon.beaconq = ath9k_hw_beaconq_setup(sc->sc_ah);
|
sc->beacon.beaconq = ath9k_hw_beaconq_setup(sc->sc_ah);
|
||||||
sc->beacon.cabq = ath_txq_setup(sc, ATH9K_TX_QUEUE_CAB, 0);
|
sc->beacon.cabq = ath_txq_setup(sc, ATH9K_TX_QUEUE_CAB, 0);
|
||||||
|
|
||||||
sc->config.cabqReadytime = ATH_CABQ_READY_TIME;
|
|
||||||
ath_cabq_update(sc);
|
ath_cabq_update(sc);
|
||||||
|
|
||||||
sc->tx.uapsdq = ath_txq_setup(sc, ATH9K_TX_QUEUE_UAPSD, 0);
|
sc->tx.uapsdq = ath_txq_setup(sc, ATH9K_TX_QUEUE_UAPSD, 0);
|
||||||
|
|
|
@ -603,8 +603,6 @@ enum ath9k_tx_queue_flags {
|
||||||
#define ATH9K_TXQ_USE_LOCKOUT_BKOFF_DIS 0x00000001
|
#define ATH9K_TXQ_USE_LOCKOUT_BKOFF_DIS 0x00000001
|
||||||
|
|
||||||
#define ATH9K_DECOMP_MASK_SIZE 128
|
#define ATH9K_DECOMP_MASK_SIZE 128
|
||||||
#define ATH9K_READY_TIME_LO_BOUND 50
|
|
||||||
#define ATH9K_READY_TIME_HI_BOUND 96
|
|
||||||
|
|
||||||
enum ath9k_pkt_type {
|
enum ath9k_pkt_type {
|
||||||
ATH9K_PKT_TYPE_NORMAL = 0,
|
ATH9K_PKT_TYPE_NORMAL = 0,
|
||||||
|
|
|
@ -1695,16 +1695,9 @@ int ath_cabq_update(struct ath_softc *sc)
|
||||||
int qnum = sc->beacon.cabq->axq_qnum;
|
int qnum = sc->beacon.cabq->axq_qnum;
|
||||||
|
|
||||||
ath9k_hw_get_txq_props(sc->sc_ah, qnum, &qi);
|
ath9k_hw_get_txq_props(sc->sc_ah, qnum, &qi);
|
||||||
/*
|
|
||||||
* Ensure the readytime % is within the bounds.
|
|
||||||
*/
|
|
||||||
if (sc->config.cabqReadytime < ATH9K_READY_TIME_LO_BOUND)
|
|
||||||
sc->config.cabqReadytime = ATH9K_READY_TIME_LO_BOUND;
|
|
||||||
else if (sc->config.cabqReadytime > ATH9K_READY_TIME_HI_BOUND)
|
|
||||||
sc->config.cabqReadytime = ATH9K_READY_TIME_HI_BOUND;
|
|
||||||
|
|
||||||
qi.tqi_readyTime = (cur_conf->beacon_interval *
|
qi.tqi_readyTime = (cur_conf->beacon_interval *
|
||||||
sc->config.cabqReadytime) / 100;
|
ATH_CABQ_READY_TIME) / 100;
|
||||||
ath_txq_update(sc, qnum, &qi);
|
ath_txq_update(sc, qnum, &qi);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
Loading…
Reference in New Issue