diff options
author | Sujith <Sujith.Manoharan@atheros.com> | 2009-02-17 05:06:35 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-02-27 14:52:39 -0500 |
commit | fdbf7335ea1a4048ff4818bf15bdcab1925dc6df (patch) | |
tree | e9569a933913de303c5c1e984148b43bd2444fec /drivers/net | |
parent | f7a99e46bef0f56549a041e867708b2f63d2e81c (diff) |
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: Sujith <Sujith.Manoharan@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/wireless/ath9k/xmit.c | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/drivers/net/wireless/ath9k/xmit.c b/drivers/net/wireless/ath9k/xmit.c index 84fd3eef0010..363bb2a94d99 100644 --- a/drivers/net/wireless/ath9k/xmit.c +++ b/drivers/net/wireless/ath9k/xmit.c | |||
@@ -772,19 +772,6 @@ bool ath_tx_aggr_check(struct ath_softc *sc, struct ath_node *an, u8 tidno) | |||
772 | /* Queue Management */ | 772 | /* Queue Management */ |
773 | /********************/ | 773 | /********************/ |
774 | 774 | ||
775 | static void ath_get_beaconconfig(struct ath_softc *sc, int if_id, | ||
776 | struct ath_beacon_config *conf) | ||
777 | { | ||
778 | struct ieee80211_hw *hw = sc->hw; | ||
779 | |||
780 | /* fill in beacon config data */ | ||
781 | |||
782 | conf->beacon_interval = hw->conf.beacon_int; | ||
783 | conf->listen_interval = 100; | ||
784 | conf->dtim_count = 1; | ||
785 | conf->bmiss_timeout = ATH_DEFAULT_BMISS_LIMIT * conf->listen_interval; | ||
786 | } | ||
787 | |||
788 | static void ath_txq_drain_pending_buffers(struct ath_softc *sc, | 775 | static void ath_txq_drain_pending_buffers(struct ath_softc *sc, |
789 | struct ath_txq *txq) | 776 | struct ath_txq *txq) |
790 | { | 777 | { |
@@ -959,7 +946,6 @@ int ath_cabq_update(struct ath_softc *sc) | |||
959 | { | 946 | { |
960 | struct ath9k_tx_queue_info qi; | 947 | struct ath9k_tx_queue_info qi; |
961 | int qnum = sc->beacon.cabq->axq_qnum; | 948 | int qnum = sc->beacon.cabq->axq_qnum; |
962 | struct ath_beacon_config conf; | ||
963 | 949 | ||
964 | ath9k_hw_get_txq_props(sc->sc_ah, qnum, &qi); | 950 | ath9k_hw_get_txq_props(sc->sc_ah, qnum, &qi); |
965 | /* | 951 | /* |
@@ -970,9 +956,8 @@ int ath_cabq_update(struct ath_softc *sc) | |||
970 | else if (sc->config.cabqReadytime > ATH9K_READY_TIME_HI_BOUND) | 956 | else if (sc->config.cabqReadytime > ATH9K_READY_TIME_HI_BOUND) |
971 | sc->config.cabqReadytime = ATH9K_READY_TIME_HI_BOUND; | 957 | sc->config.cabqReadytime = ATH9K_READY_TIME_HI_BOUND; |
972 | 958 | ||
973 | ath_get_beaconconfig(sc, ATH_IF_ID_ANY, &conf); | 959 | qi.tqi_readyTime = (sc->hw->conf.beacon_int * |
974 | qi.tqi_readyTime = | 960 | sc->config.cabqReadytime) / 100; |
975 | (conf.beacon_interval * sc->config.cabqReadytime) / 100; | ||
976 | ath_txq_update(sc, qnum, &qi); | 961 | ath_txq_update(sc, qnum, &qi); |
977 | 962 | ||
978 | return 0; | 963 | return 0; |