2011-12-05 14:20:25 +00:00
|
|
|
--- a/drivers/net/wireless/ath/ath9k/hw.c
|
|
|
|
|
+++ b/drivers/net/wireless/ath/ath9k/hw.c
|
2012-02-07 11:28:11 +00:00
|
|
|
@@ -1005,16 +1005,26 @@ void ath9k_hw_init_global_settings(struc
|
2011-12-05 14:20:25 +00:00
|
|
|
|
|
|
|
|
if (IS_CHAN_HALF_RATE(chan)) {
|
|
|
|
|
eifs = 175;
|
|
|
|
|
- rx_lat *= 2;
|
|
|
|
|
+
|
|
|
|
|
+ if (!AR_SREV_9300_20_OR_LATER(ah))
|
|
|
|
|
+ rx_lat = 10;
|
|
|
|
|
+ else
|
|
|
|
|
+ rx_lat *= 2;
|
|
|
|
|
+
|
|
|
|
|
tx_lat *= 2;
|
|
|
|
|
if (IS_CHAN_A_FAST_CLOCK(ah, chan))
|
|
|
|
|
- tx_lat += 11;
|
|
|
|
|
+ tx_lat += 11;
|
|
|
|
|
|
|
|
|
|
slottime = 13;
|
|
|
|
|
sifstime = 32;
|
|
|
|
|
} else if (IS_CHAN_QUARTER_RATE(chan)) {
|
|
|
|
|
eifs = 340;
|
|
|
|
|
- rx_lat = (rx_lat * 4) - 1;
|
|
|
|
|
+
|
|
|
|
|
+ if (!AR_SREV_9300_20_OR_LATER(ah))
|
|
|
|
|
+ rx_lat = 20;
|
|
|
|
|
+ else
|
|
|
|
|
+ rx_lat = (rx_lat * 4) - 1;
|
|
|
|
|
+
|
|
|
|
|
tx_lat *= 4;
|
|
|
|
|
if (IS_CHAN_A_FAST_CLOCK(ah, chan))
|
|
|
|
|
tx_lat += 22;
|
