diff options
author | Helmut Schaa <helmut.schaa@googlemail.com> | 2010-09-08 14:56:04 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-09-14 16:03:43 -0400 |
commit | 47ee3eb1359a5444efd9f529e3d28c02e8e405e7 (patch) | |
tree | 0e631a07d3ccbabf1473949e6064a93c8318da43 | |
parent | 85f4d6488cba35d3bb58833edbcb28faaffdd37c (diff) |
rt2x00: Initialize AMPDU_BA_WINSIZE register
Since we're not using the AMPDU_BA_WINSIZE register to force the BlockAck
window size (we specify it in every TXWI) we should initialize it to 0.
Signed-off-by: Helmut Schaa <helmut.schaa@googlemail.com>
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2800.h | 12 | ||||
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2800lib.c | 8 |
2 files changed, 20 insertions, 0 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2800.h b/drivers/net/wireless/rt2x00/rt2800.h index 70a5cb86405..2edc7742a7e 100644 --- a/drivers/net/wireless/rt2x00/rt2800.h +++ b/drivers/net/wireless/rt2x00/rt2800.h | |||
@@ -639,6 +639,18 @@ | |||
639 | #define LED_CFG_LED_POLAR FIELD32(0x40000000) | 639 | #define LED_CFG_LED_POLAR FIELD32(0x40000000) |
640 | 640 | ||
641 | /* | 641 | /* |
642 | * AMPDU_BA_WINSIZE: Force BlockAck window size | ||
643 | * FORCE_WINSIZE_ENABLE: | ||
644 | * 0: Disable forcing of BlockAck window size | ||
645 | * 1: Enable forcing of BlockAck window size, overwrites values BlockAck | ||
646 | * window size values in the TXWI | ||
647 | * FORCE_WINSIZE: BlockAck window size | ||
648 | */ | ||
649 | #define AMPDU_BA_WINSIZE 0x1040 | ||
650 | #define AMPDU_BA_WINSIZE_FORCE_WINSIZE_ENABLE FIELD32(0x00000020) | ||
651 | #define AMPDU_BA_WINSIZE_FORCE_WINSIZE FIELD32(0x0000001f) | ||
652 | |||
653 | /* | ||
642 | * XIFS_TIME_CFG: MAC timing | 654 | * XIFS_TIME_CFG: MAC timing |
643 | * CCKM_SIFS_TIME: unit 1us. Applied after CCK RX/TX | 655 | * CCKM_SIFS_TIME: unit 1us. Applied after CCK RX/TX |
644 | * OFDM_SIFS_TIME: unit 1us. Applied after OFDM RX/TX | 656 | * OFDM_SIFS_TIME: unit 1us. Applied after OFDM RX/TX |
diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c index f90e932b3cb..78e5830c86c 100644 --- a/drivers/net/wireless/rt2x00/rt2800lib.c +++ b/drivers/net/wireless/rt2x00/rt2800lib.c | |||
@@ -2053,6 +2053,14 @@ static int rt2800_init_registers(struct rt2x00_dev *rt2x00dev) | |||
2053 | rt2800_register_write(rt2x00dev, LG_FBK_CFG1, reg); | 2053 | rt2800_register_write(rt2x00dev, LG_FBK_CFG1, reg); |
2054 | 2054 | ||
2055 | /* | 2055 | /* |
2056 | * Do not force the BA window size, we use the TXWI to set it | ||
2057 | */ | ||
2058 | rt2800_register_read(rt2x00dev, AMPDU_BA_WINSIZE, ®); | ||
2059 | rt2x00_set_field32(®, AMPDU_BA_WINSIZE_FORCE_WINSIZE_ENABLE, 0); | ||
2060 | rt2x00_set_field32(®, AMPDU_BA_WINSIZE_FORCE_WINSIZE, 0); | ||
2061 | rt2800_register_write(rt2x00dev, AMPDU_BA_WINSIZE, reg); | ||
2062 | |||
2063 | /* | ||
2056 | * We must clear the error counters. | 2064 | * We must clear the error counters. |
2057 | * These registers are cleared on read, | 2065 | * These registers are cleared on read, |
2058 | * so we may pass a useless variable to store the value. | 2066 | * so we may pass a useless variable to store the value. |