aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel/mac80211/patches/608-add_platform_data_mac_addr.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2016-01-15 15:03:48 +0000
committerFelix Fietkau <nbd@openwrt.org>2016-01-15 15:03:48 +0000
commit82c5e2c497c69dca32a59090cddf5f298aa94e01 (patch)
treeeff71d008e97ad7d5ba575b07a01c5d046063e24 /package/kernel/mac80211/patches/608-add_platform_data_mac_addr.patch
parent56f6d357167e19e26455135e4c3778692aef0de2 (diff)
downloadupstream-82c5e2c497c69dca32a59090cddf5f298aa94e01.tar.gz
upstream-82c5e2c497c69dca32a59090cddf5f298aa94e01.tar.bz2
upstream-82c5e2c497c69dca32a59090cddf5f298aa94e01.zip
mac80211: update to wireless-testing 2016-01-10
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 48247
Diffstat (limited to 'package/kernel/mac80211/patches/608-add_platform_data_mac_addr.patch')
-rw-r--r--package/kernel/mac80211/patches/608-add_platform_data_mac_addr.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/package/kernel/mac80211/patches/608-add_platform_data_mac_addr.patch b/package/kernel/mac80211/patches/608-add_platform_data_mac_addr.patch
index 848e71bd0a..a645ba176e 100644
--- a/package/kernel/mac80211/patches/608-add_platform_data_mac_addr.patch
+++ b/package/kernel/mac80211/patches/608-add_platform_data_mac_addr.patch
@@ -31,7 +31,7 @@
{
--- a/drivers/net/wireless/ralink/rt2x00/rt2x00.h
+++ b/drivers/net/wireless/ralink/rt2x00/rt2x00.h
-@@ -1412,6 +1412,7 @@ static inline void rt2x00debug_dump_fram
+@@ -1414,6 +1414,7 @@ static inline void rt2x00debug_dump_fram
*/
u32 rt2x00lib_get_bssidx(struct rt2x00_dev *rt2x00dev,
struct ieee80211_vif *vif);
@@ -41,7 +41,7 @@
* Interrupt context handlers.
--- a/drivers/net/wireless/ralink/rt2x00/rt61pci.c
+++ b/drivers/net/wireless/ralink/rt2x00/rt61pci.c
-@@ -2390,6 +2390,7 @@ static int rt61pci_validate_eeprom(struc
+@@ -2392,6 +2392,7 @@ static int rt61pci_validate_eeprom(struc
u32 reg;
u16 word;
u8 *mac;
@@ -49,7 +49,7 @@
s8 value;
rt2x00mmio_register_read(rt2x00dev, E2PROM_CSR, &reg);
-@@ -2410,7 +2411,11 @@ static int rt61pci_validate_eeprom(struc
+@@ -2412,7 +2413,11 @@ static int rt61pci_validate_eeprom(struc
/*
* Start validation of the data that has been read.
*/