diff options
| author | Steve Brown <sbrown@cortland.com> | 2011-02-07 17:10:39 -0700 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-02-09 16:09:48 -0500 |
| commit | 9814f6b34be5179849c0872e81eb99286ef4b051 (patch) | |
| tree | 863e6507e0141acec4492f5b941490e3f5458204 /drivers/net/wireless/ath/ath9k/xmit.c | |
| parent | 59bdf3b0fe7a183f18ce94696259c4c76abb4568 (diff) | |
| download | kernel_samsung_aries-9814f6b34be5179849c0872e81eb99286ef4b051.zip kernel_samsung_aries-9814f6b34be5179849c0872e81eb99286ef4b051.tar.gz kernel_samsung_aries-9814f6b34be5179849c0872e81eb99286ef4b051.tar.bz2 | |
ath9k: Remove redundant beacon_interval
The variable appears in both ath_softc and ath_beacon_config.
The struct ath_beacon_config is embedded in ath_softc. The redundant
variable was added by commit id 57c4d7b4c4986037be51476b8e3025d5ba18d8b8.
Signed-off-by: Steve Brown <sbrown@cortland.com>
Reviewed-by: Mohammed Shafi <shafi.ath9k@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/xmit.c')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/xmit.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c index 68a1c76..8d89aa9 100644 --- a/drivers/net/wireless/ath/ath9k/xmit.c +++ b/drivers/net/wireless/ath/ath9k/xmit.c @@ -1055,6 +1055,7 @@ int ath_txq_update(struct ath_softc *sc, int qnum, int ath_cabq_update(struct ath_softc *sc) { struct ath9k_tx_queue_info qi; + struct ath_beacon_config *cur_conf = &sc->cur_beacon_conf; int qnum = sc->beacon.cabq->axq_qnum; ath9k_hw_get_txq_props(sc->sc_ah, qnum, &qi); @@ -1066,7 +1067,7 @@ 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; - qi.tqi_readyTime = (sc->beacon_interval * + qi.tqi_readyTime = (cur_conf->beacon_interval * sc->config.cabqReadytime) / 100; ath_txq_update(sc, qnum, &qi); |