diff options
author | Felix Fietkau <nbd@openwrt.org> | 2011-03-19 08:55:41 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-03-30 14:15:16 -0400 |
commit | f171760c558946c7a2e0ee310dfb968f9d4853c6 (patch) | |
tree | bd9fde75cb9df12eab81ae3a6d098930e7bc5d21 /drivers/net/wireless/ath/ath9k | |
parent | 6de66dd963ddd669667a81a2401f2fd6472ff55c (diff) |
ath9k_hw: enable a BlockAck related fixup specific to AR9100
Fixes interop issues with aggregation in combination with multi-BSSID
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath/ath9k')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/hw.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath9k/reg.h | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c index b170c455a40b..175c36f3fdac 100644 --- a/drivers/net/wireless/ath/ath9k/hw.c +++ b/drivers/net/wireless/ath/ath9k/hw.c | |||
@@ -410,6 +410,8 @@ static void ath9k_hw_init_defaults(struct ath_hw *ah) | |||
410 | ah->sta_id1_defaults = | 410 | ah->sta_id1_defaults = |
411 | AR_STA_ID1_CRPT_MIC_ENABLE | | 411 | AR_STA_ID1_CRPT_MIC_ENABLE | |
412 | AR_STA_ID1_MCAST_KSRCH; | 412 | AR_STA_ID1_MCAST_KSRCH; |
413 | if (AR_SREV_9100(ah)) | ||
414 | ah->sta_id1_defaults |= AR_STA_ID1_AR9100_BA_FIX; | ||
413 | ah->enable_32kHz_clock = DONT_USE_32KHZ; | 415 | ah->enable_32kHz_clock = DONT_USE_32KHZ; |
414 | ah->slottime = 20; | 416 | ah->slottime = 20; |
415 | ah->globaltxtimeout = (u32) -1; | 417 | ah->globaltxtimeout = (u32) -1; |
diff --git a/drivers/net/wireless/ath/ath9k/reg.h b/drivers/net/wireless/ath/ath9k/reg.h index 8fa8acfde62e..693d543937b5 100644 --- a/drivers/net/wireless/ath/ath9k/reg.h +++ b/drivers/net/wireless/ath/ath9k/reg.h | |||
@@ -1396,6 +1396,7 @@ enum { | |||
1396 | #define AR_STA_ID1_PCF 0x00100000 | 1396 | #define AR_STA_ID1_PCF 0x00100000 |
1397 | #define AR_STA_ID1_USE_DEFANT 0x00200000 | 1397 | #define AR_STA_ID1_USE_DEFANT 0x00200000 |
1398 | #define AR_STA_ID1_DEFANT_UPDATE 0x00400000 | 1398 | #define AR_STA_ID1_DEFANT_UPDATE 0x00400000 |
1399 | #define AR_STA_ID1_AR9100_BA_FIX 0x00400000 | ||
1399 | #define AR_STA_ID1_RTS_USE_DEF 0x00800000 | 1400 | #define AR_STA_ID1_RTS_USE_DEF 0x00800000 |
1400 | #define AR_STA_ID1_ACKCTS_6MB 0x01000000 | 1401 | #define AR_STA_ID1_ACKCTS_6MB 0x01000000 |
1401 | #define AR_STA_ID1_BASE_RATE_11B 0x02000000 | 1402 | #define AR_STA_ID1_BASE_RATE_11B 0x02000000 |