diff options
-rw-r--r-- | drivers/net/wireless/ath/ath9k/hw.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c index 3a16ba256ef9..468ac4b17dfb 100644 --- a/drivers/net/wireless/ath/ath9k/hw.c +++ b/drivers/net/wireless/ath/ath9k/hw.c | |||
@@ -960,7 +960,7 @@ void ath9k_hw_init_global_settings(struct ath_hw *ah) | |||
960 | struct ath_common *common = ath9k_hw_common(ah); | 960 | struct ath_common *common = ath9k_hw_common(ah); |
961 | struct ieee80211_conf *conf = &common->hw->conf; | 961 | struct ieee80211_conf *conf = &common->hw->conf; |
962 | const struct ath9k_channel *chan = ah->curchan; | 962 | const struct ath9k_channel *chan = ah->curchan; |
963 | int acktimeout; | 963 | int acktimeout, ctstimeout; |
964 | int slottime; | 964 | int slottime; |
965 | int sifstime; | 965 | int sifstime; |
966 | int rx_lat = 0, tx_lat = 0, eifs = 0; | 966 | int rx_lat = 0, tx_lat = 0, eifs = 0; |
@@ -1017,6 +1017,7 @@ void ath9k_hw_init_global_settings(struct ath_hw *ah) | |||
1017 | 1017 | ||
1018 | /* As defined by IEEE 802.11-2007 17.3.8.6 */ | 1018 | /* As defined by IEEE 802.11-2007 17.3.8.6 */ |
1019 | acktimeout = slottime + sifstime + 3 * ah->coverage_class; | 1019 | acktimeout = slottime + sifstime + 3 * ah->coverage_class; |
1020 | ctstimeout = acktimeout; | ||
1020 | 1021 | ||
1021 | /* | 1022 | /* |
1022 | * Workaround for early ACK timeouts, add an offset to match the | 1023 | * Workaround for early ACK timeouts, add an offset to match the |
@@ -1031,7 +1032,7 @@ void ath9k_hw_init_global_settings(struct ath_hw *ah) | |||
1031 | ath9k_hw_set_sifs_time(ah, sifstime); | 1032 | ath9k_hw_set_sifs_time(ah, sifstime); |
1032 | ath9k_hw_setslottime(ah, slottime); | 1033 | ath9k_hw_setslottime(ah, slottime); |
1033 | ath9k_hw_set_ack_timeout(ah, acktimeout); | 1034 | ath9k_hw_set_ack_timeout(ah, acktimeout); |
1034 | ath9k_hw_set_cts_timeout(ah, acktimeout); | 1035 | ath9k_hw_set_cts_timeout(ah, ctstimeout); |
1035 | if (ah->globaltxtimeout != (u32) -1) | 1036 | if (ah->globaltxtimeout != (u32) -1) |
1036 | ath9k_hw_set_global_txtimeout(ah, ah->globaltxtimeout); | 1037 | ath9k_hw_set_global_txtimeout(ah, ah->globaltxtimeout); |
1037 | 1038 | ||