diff options
Diffstat (limited to 'drivers/net/wireless/ath/ath5k/qcu.c')
-rw-r--r-- | drivers/net/wireless/ath/ath5k/qcu.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/net/wireless/ath/ath5k/qcu.c b/drivers/net/wireless/ath/ath5k/qcu.c index a6de200538c3..65fe929529a8 100644 --- a/drivers/net/wireless/ath/ath5k/qcu.c +++ b/drivers/net/wireless/ath/ath5k/qcu.c | |||
@@ -565,6 +565,7 @@ ath5k_hw_reset_tx_queue(struct ath5k_hw *ah, unsigned int queue) | |||
565 | int ath5k_hw_set_ifs_intervals(struct ath5k_hw *ah, unsigned int slot_time) | 565 | int ath5k_hw_set_ifs_intervals(struct ath5k_hw *ah, unsigned int slot_time) |
566 | { | 566 | { |
567 | struct ieee80211_channel *channel = ah->ah_current_channel; | 567 | struct ieee80211_channel *channel = ah->ah_current_channel; |
568 | enum ieee80211_band band; | ||
568 | struct ieee80211_rate *rate; | 569 | struct ieee80211_rate *rate; |
569 | u32 ack_tx_time, eifs, eifs_clock, sifs, sifs_clock; | 570 | u32 ack_tx_time, eifs, eifs_clock, sifs, sifs_clock; |
570 | u32 slot_time_clock = ath5k_hw_htoclock(ah, slot_time); | 571 | u32 slot_time_clock = ath5k_hw_htoclock(ah, slot_time); |
@@ -600,11 +601,12 @@ int ath5k_hw_set_ifs_intervals(struct ath5k_hw *ah, unsigned int slot_time) | |||
600 | * Also we have different lowest rate for 802.11a | 601 | * Also we have different lowest rate for 802.11a |
601 | */ | 602 | */ |
602 | if (channel->band == IEEE80211_BAND_5GHZ) | 603 | if (channel->band == IEEE80211_BAND_5GHZ) |
603 | rate = &ah->sbands[IEEE80211_BAND_5GHZ].bitrates[0]; | 604 | band = IEEE80211_BAND_5GHZ; |
604 | else | 605 | else |
605 | rate = &ah->sbands[IEEE80211_BAND_2GHZ].bitrates[0]; | 606 | band = IEEE80211_BAND_2GHZ; |
606 | 607 | ||
607 | ack_tx_time = ath5k_hw_get_frame_duration(ah, 10, rate, false); | 608 | rate = &ah->sbands[band].bitrates[0]; |
609 | ack_tx_time = ath5k_hw_get_frame_duration(ah, band, 10, rate, false); | ||
608 | 610 | ||
609 | /* ack_tx_time includes an SIFS already */ | 611 | /* ack_tx_time includes an SIFS already */ |
610 | eifs = ack_tx_time + sifs + 2 * slot_time; | 612 | eifs = ack_tx_time + sifs + 2 * slot_time; |