projects
/
openwrt
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rt2x00: merge beacon setup fixes, disable unused hw beacon slots
[openwrt/openwrt.git]
/
package
/
kernel
/
mac80211
/
patches
/
600-0005-rt2x00-rt2800lib-add-hw_beacon_count-field-to-struct.patch
diff --git
a/package/kernel/mac80211/patches/600-0005-rt2x00-rt2800lib-add-hw_beacon_count-field-to-struct.patch
b/package/kernel/mac80211/patches/600-0005-rt2x00-rt2800lib-add-hw_beacon_count-field-to-struct.patch
index d832f99404b4224cb2abd6db2c44a900feeee500..0b509df128c9033ec9eba82aaaad2cf29c52832f 100644
(file)
--- a/
package/kernel/mac80211/patches/600-0005-rt2x00-rt2800lib-add-hw_beacon_count-field-to-struct.patch
+++ b/
package/kernel/mac80211/patches/600-0005-rt2x00-rt2800lib-add-hw_beacon_count-field-to-struct.patch
@@
-24,7
+24,7
@@
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
--- a/drivers/net/wireless/rt2x00/rt2800lib.c
+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
--- a/drivers/net/wireless/rt2x00/rt2800lib.c
+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
-@@ -4
583,6 +4583
,7 @@ EXPORT_SYMBOL_GPL(rt2800_link_tuner);
+@@ -4
628,6 +4628
,7 @@ EXPORT_SYMBOL_GPL(rt2800_link_tuner);
*/
static int rt2800_init_registers(struct rt2x00_dev *rt2x00dev)
{
*/
static int rt2800_init_registers(struct rt2x00_dev *rt2x00dev)
{
@@
-32,7
+32,7
@@
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
u32 reg;
u16 eeprom;
unsigned int i;
u32 reg;
u16 eeprom;
unsigned int i;
-@@ -49
70,7 +4971
,7 @@ static int rt2800_init_registers(struct
+@@ -49
93,7 +4994
,7 @@ static int rt2800_init_registers(struct
/*
* Clear all beacons
*/
/*
* Clear all beacons
*/
@@
-41,7
+41,7
@@
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
rt2800_clear_beacon_register(rt2x00dev, i);
if (rt2x00_is_usb(rt2x00dev)) {
rt2800_clear_beacon_register(rt2x00dev, i);
if (rt2x00_is_usb(rt2x00dev)) {
-@@ -78
16,6 +7817
,8 @@ int rt2800_probe_hw(struct rt2x00_dev *r
+@@ -78
39,6 +7840
,8 @@ int rt2800_probe_hw(struct rt2x00_dev *r
if (rt2x00_rt(rt2x00dev, RT3593))
__set_bit(RT2800_HAS_HIGH_SHARED_MEM, &drv_data->rt2800_flags);
if (rt2x00_rt(rt2x00dev, RT3593))
__set_bit(RT2800_HAS_HIGH_SHARED_MEM, &drv_data->rt2800_flags);