diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2014-06-05 14:09:14 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2014-06-05 14:09:14 +0000 |
| commit | 236e7ee23997523bbb5d8bda001768523967d99a (patch) | |
| tree | 755e8075cefece25370a65816f0b3da20b475034 /package/kernel/mac80211/patches/600-0014-rt2x00-rt2800lib-add-MAC-register-initialization-for.patch | |
| parent | 2454ee8645432e4975ee9c05e22f5feef5e76243 (diff) | |
| download | upstream-236e7ee23997523bbb5d8bda001768523967d99a.tar.gz upstream-236e7ee23997523bbb5d8bda001768523967d99a.tar.bz2 upstream-236e7ee23997523bbb5d8bda001768523967d99a.zip | |
rt2x00: merge beacon setup fixes, disable unused hw beacon slots
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 41016
Diffstat (limited to 'package/kernel/mac80211/patches/600-0014-rt2x00-rt2800lib-add-MAC-register-initialization-for.patch')
| -rw-r--r-- | package/kernel/mac80211/patches/600-0014-rt2x00-rt2800lib-add-MAC-register-initialization-for.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/package/kernel/mac80211/patches/600-0014-rt2x00-rt2800lib-add-MAC-register-initialization-for.patch b/package/kernel/mac80211/patches/600-0014-rt2x00-rt2800lib-add-MAC-register-initialization-for.patch index 95423d1755..65c67205ee 100644 --- a/package/kernel/mac80211/patches/600-0014-rt2x00-rt2800lib-add-MAC-register-initialization-for.patch +++ b/package/kernel/mac80211/patches/600-0014-rt2x00-rt2800lib-add-MAC-register-initialization-for.patch @@ -35,7 +35,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org> #define RX_FILTER_CFG 0x1400 --- a/drivers/net/wireless/rt2x00/rt2800lib.c +++ b/drivers/net/wireless/rt2x00/rt2800lib.c -@@ -4972,6 +4972,12 @@ static int rt2800_init_registers(struct +@@ -4995,6 +4995,12 @@ static int rt2800_init_registers(struct rt2800_register_write(rt2x00dev, TX_SW_CFG2, 0x00000000); } @@ -48,7 +48,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org> } else if (rt2x00_rt(rt2x00dev, RT5390) || rt2x00_rt(rt2x00dev, RT5392) || rt2x00_rt(rt2x00dev, RT5592)) { -@@ -5002,9 +5008,11 @@ static int rt2800_init_registers(struct +@@ -5025,9 +5031,11 @@ static int rt2800_init_registers(struct rt2800_register_read(rt2x00dev, MAX_LEN_CFG, ®); rt2x00_set_field32(®, MAX_LEN_CFG_MAX_MPDU, AGGREGATION_SIZE); @@ -63,7 +63,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org> rt2x00_set_field32(®, MAX_LEN_CFG_MAX_PSDU, 2); else rt2x00_set_field32(®, MAX_LEN_CFG_MAX_PSDU, 1); -@@ -5157,6 +5165,11 @@ static int rt2800_init_registers(struct +@@ -5180,6 +5188,11 @@ static int rt2800_init_registers(struct reg = rt2x00_rt(rt2x00dev, RT5592) ? 0x00000082 : 0x00000002; rt2800_register_write(rt2x00dev, TXOP_HLDR_ET, reg); |