summaryrefslogtreecommitdiffstats
path: root/package/kernel/mac80211/patches/608-add_platform_data_mac_addr.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2014-01-30 13:21:36 +0000
committerFelix Fietkau <nbd@openwrt.org>2014-01-30 13:21:36 +0000
commiteb7a1ba94b7221358ab5f207d8af8dc8b7a2cf74 (patch)
treef384015bf67b4da2efefd6d04a7f620dfe4504b1 /package/kernel/mac80211/patches/608-add_platform_data_mac_addr.patch
parent2725913d2acca4774c41c7de0d8f4940615a3f1d (diff)
downloadmaster-31e0f0ae-eb7a1ba94b7221358ab5f207d8af8dc8b7a2cf74.tar.gz
master-31e0f0ae-eb7a1ba94b7221358ab5f207d8af8dc8b7a2cf74.tar.bz2
master-31e0f0ae-eb7a1ba94b7221358ab5f207d8af8dc8b7a2cf74.zip
mac80211: update to wireless-testing 2014-01-23
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 39427
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.patch8
1 files changed, 4 insertions, 4 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 13f1ed2aea..a910cc36c0 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
@@ -10,7 +10,7 @@
int disable_5ghz;
--- a/drivers/net/wireless/rt2x00/rt2x00dev.c
+++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
-@@ -930,6 +930,18 @@ static void rt2x00lib_rate(struct ieee80
+@@ -928,6 +928,18 @@ static void rt2x00lib_rate(struct ieee80
entry->flags |= IEEE80211_RATE_SHORT_PREAMBLE;
}
@@ -31,7 +31,7 @@
{
--- a/drivers/net/wireless/rt2x00/rt2x00.h
+++ b/drivers/net/wireless/rt2x00/rt2x00.h
-@@ -1403,6 +1403,7 @@ static inline void rt2x00debug_dump_fram
+@@ -1401,6 +1401,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/rt2x00/rt61pci.c
+++ b/drivers/net/wireless/rt2x00/rt61pci.c
-@@ -2395,6 +2395,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);
-@@ -2415,7 +2416,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.
*/