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-02-29 17:19:04 +0000
committerFelix Fietkau <nbd@openwrt.org>2016-02-29 17:19:04 +0000
commitf3a1db04f0ebba577598f1577d3c8c756c8bf757 (patch)
treeeecfe6c9154a9e0717573daba16d1c58bd674d2e /package/kernel/mac80211/patches/608-add_platform_data_mac_addr.patch
parent5db86ba649298bef0066cac8e4d0e17834f6b7b0 (diff)
downloadupstream-f3a1db04f0ebba577598f1577d3c8c756c8bf757.tar.gz
upstream-f3a1db04f0ebba577598f1577d3c8c756c8bf757.tar.bz2
upstream-f3a1db04f0ebba577598f1577d3c8c756c8bf757.zip
mac80211: backport from trunk r48782 + required kernel patches and mt76, mwlwifi
Signed-off-by: Felix Fietkau <nbd@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@48822 3c298f89-4303-0410-b956-a3cf2f4a3e73
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.patch14
1 files changed, 7 insertions, 7 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 a35bd55a7c..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
@@ -8,8 +8,8 @@
int disable_2ghz;
int disable_5ghz;
---- a/drivers/net/wireless/rt2x00/rt2x00dev.c
-+++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
+--- a/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c
++++ b/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c
@@ -931,6 +931,18 @@ static void rt2x00lib_rate(struct ieee80
entry->flags |= IEEE80211_RATE_SHORT_PREAMBLE;
}
@@ -29,9 +29,9 @@
static int rt2x00lib_probe_hw_modes(struct rt2x00_dev *rt2x00dev,
struct hw_mode_spec *spec)
{
---- a/drivers/net/wireless/rt2x00/rt2x00.h
-+++ b/drivers/net/wireless/rt2x00/rt2x00.h
-@@ -1410,6 +1410,7 @@ static inline void rt2x00debug_dump_fram
+--- a/drivers/net/wireless/ralink/rt2x00/rt2x00.h
++++ b/drivers/net/wireless/ralink/rt2x00/rt2x00.h
+@@ -1414,6 +1414,7 @@ static inline void rt2x00debug_dump_fram
*/
u32 rt2x00lib_get_bssidx(struct rt2x00_dev *rt2x00dev,
struct ieee80211_vif *vif);
@@ -39,8 +39,8 @@
/*
* Interrupt context handlers.
---- a/drivers/net/wireless/rt2x00/rt61pci.c
-+++ b/drivers/net/wireless/rt2x00/rt61pci.c
+--- a/drivers/net/wireless/ralink/rt2x00/rt61pci.c
++++ b/drivers/net/wireless/ralink/rt2x00/rt61pci.c
@@ -2392,6 +2392,7 @@ static int rt61pci_validate_eeprom(struc
u32 reg;
u16 word;