diff options
| author | Lorenzo Bianconi <lorenzo.bianconi83@gmail.com> | 2014-09-16 02:13:11 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-09-16 16:18:38 -0400 |
| commit | 7aefa8aacbd4694db9a7ea7cbff490a1e31c3613 (patch) | |
| tree | 2a8a6f1442ca1c60ca02045d369d33e9257b406f | |
| parent | ce7191526854f79b90bf627c5a8b8993491a3c2b (diff) | |
| download | op-kernel-dev-7aefa8aacbd4694db9a7ea7cbff490a1e31c3613.zip op-kernel-dev-7aefa8aacbd4694db9a7ea7cbff490a1e31c3613.tar.gz | |
ath9k: do not overwrite ACK timeout estimation
Do not overwrite ACK timeout estimation in ath9k_hw_init_global_settings() if
dynack processing has been enabled
Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi83@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/hw.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c index e71f824..949d5d6 100644 --- a/drivers/net/wireless/ath/ath9k/hw.c +++ b/drivers/net/wireless/ath/ath9k/hw.c @@ -1055,6 +1055,14 @@ void ath9k_hw_init_global_settings(struct ath_hw *ah) ctstimeout += 48 - sifstime - ah->slottime; } + if (ah->dynack.enabled) { + acktimeout = ah->dynack.ackto; + ctstimeout = acktimeout; + slottime = (acktimeout - 3) / 2; + } else { + ah->dynack.ackto = acktimeout; + } + ath9k_hw_set_sifs_time(ah, sifstime); ath9k_hw_setslottime(ah, slottime); ath9k_hw_set_ack_timeout(ah, acktimeout); |
