2011-08-28 02:53:49 +03:00
|
|
|
--- a/drivers/net/wireless/ath/ath9k/hw.c
|
|
|
|
|
+++ b/drivers/net/wireless/ath/ath9k/hw.c
|
|
|
|
|
@@ -969,7 +969,7 @@ void ath9k_hw_init_global_settings(struc
|
|
|
|
|
struct ath_common *common = ath9k_hw_common(ah);
|
|
|
|
|
struct ieee80211_conf *conf = &common->hw->conf;
|
|
|
|
|
const struct ath9k_channel *chan = ah->curchan;
|
|
|
|
|
- int acktimeout;
|
|
|
|
|
+ int acktimeout, ctstimeout;
|
|
|
|
|
int slottime;
|
|
|
|
|
int sifstime;
|
|
|
|
|
int rx_lat = 0, tx_lat = 0, eifs = 0;
|
2011-08-31 09:34:53 +03:00
|
|
|
@@ -1029,6 +1029,7 @@ void ath9k_hw_init_global_settings(struc
|
2011-08-28 02:53:49 +03:00
|
|
|
|
|
|
|
|
/* As defined by IEEE 802.11-2007 17.3.8.6 */
|
|
|
|
|
acktimeout = slottime + sifstime + 3 * ah->coverage_class;
|
|
|
|
|
+ ctstimeout = acktimeout;
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Workaround for early ACK timeouts, add an offset to match the
|
2011-08-31 09:34:53 +03:00
|
|
|
@@ -1043,7 +1044,7 @@ void ath9k_hw_init_global_settings(struc
|
2011-08-28 02:53:49 +03:00
|
|
|
ath9k_hw_set_sifs_time(ah, sifstime);
|
|
|
|
|
ath9k_hw_setslottime(ah, slottime);
|
|
|
|
|
ath9k_hw_set_ack_timeout(ah, acktimeout);
|
|
|
|
|
- ath9k_hw_set_cts_timeout(ah, acktimeout);
|
|
|
|
|
+ ath9k_hw_set_cts_timeout(ah, ctstimeout);
|
|
|
|
|
if (ah->globaltxtimeout != (u32) -1)
|
|
|
|
|
ath9k_hw_set_global_txtimeout(ah, ah->globaltxtimeout);
|
|
|
|
|
|
