aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel/mac80211/patches/600-0006-rt2x00-rt2800lib-init-additional-beacon-offset-regis.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2014-06-05 14:09:14 +0000
committerFelix Fietkau <nbd@openwrt.org>2014-06-05 14:09:14 +0000
commit68d634718350ababee9c3cf16c073eaba9efa4d6 (patch)
tree0434544adc827dc4e6b8881be9614291cc19524c /package/kernel/mac80211/patches/600-0006-rt2x00-rt2800lib-init-additional-beacon-offset-regis.patch
parent48b954881f8483740f61c8054f906e4575fab6fd (diff)
downloadupstream-68d634718350ababee9c3cf16c073eaba9efa4d6.tar.gz
upstream-68d634718350ababee9c3cf16c073eaba9efa4d6.tar.bz2
upstream-68d634718350ababee9c3cf16c073eaba9efa4d6.zip
rt2x00: merge beacon setup fixes, disable unused hw beacon slots
Signed-off-by: Felix Fietkau <nbd@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41016 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/kernel/mac80211/patches/600-0006-rt2x00-rt2800lib-init-additional-beacon-offset-regis.patch')
-rw-r--r--package/kernel/mac80211/patches/600-0006-rt2x00-rt2800lib-init-additional-beacon-offset-regis.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/package/kernel/mac80211/patches/600-0006-rt2x00-rt2800lib-init-additional-beacon-offset-regis.patch b/package/kernel/mac80211/patches/600-0006-rt2x00-rt2800lib-init-additional-beacon-offset-regis.patch
index 040c69c928..95f44b524e 100644
--- a/package/kernel/mac80211/patches/600-0006-rt2x00-rt2800lib-init-additional-beacon-offset-regis.patch
+++ b/package/kernel/mac80211/patches/600-0006-rt2x00-rt2800lib-init-additional-beacon-offset-regis.patch
@@ -34,9 +34,9 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
*/
--- a/drivers/net/wireless/rt2x00/rt2800lib.c
+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
-@@ -4617,6 +4617,30 @@ static int rt2800_init_registers(struct
- rt2800_get_beacon_offset(rt2x00dev, 7));
- rt2800_register_write(rt2x00dev, BCN_OFFSET1, reg);
+@@ -4640,6 +4640,30 @@ static int rt2800_init_registers(struct
+ if (ret)
+ return ret;
+ if (drv_data->hw_beacon_count == 16) {
+ rt2800_register_read(rt2x00dev, BCN_OFFSET2, &reg);