diff options
author | Felix Fietkau <nbd@openwrt.org> | 2013-04-26 10:52:03 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2013-04-26 10:52:03 +0000 |
commit | accc6e309e9f9ce94ce34c7b2cdf60e16c78d1e1 (patch) | |
tree | 3b2ebce435696f7f85164376efffbc7758012c20 /package/mac80211/patches/608-add_platform_data_mac_addr.patch | |
parent | bc453a52b2c3b3da4dba056048cb83db195fe189 (diff) | |
download | master-31e0f0ae-accc6e309e9f9ce94ce34c7b2cdf60e16c78d1e1.tar.gz master-31e0f0ae-accc6e309e9f9ce94ce34c7b2cdf60e16c78d1e1.tar.bz2 master-31e0f0ae-accc6e309e9f9ce94ce34c7b2cdf60e16c78d1e1.zip |
mac80211: update to wireless-testing 2013-04-16 + backports
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 36448
Diffstat (limited to 'package/mac80211/patches/608-add_platform_data_mac_addr.patch')
-rw-r--r-- | package/mac80211/patches/608-add_platform_data_mac_addr.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/package/mac80211/patches/608-add_platform_data_mac_addr.patch b/package/mac80211/patches/608-add_platform_data_mac_addr.patch index bb77df9e7d..97307f01a9 100644 --- a/package/mac80211/patches/608-add_platform_data_mac_addr.patch +++ b/package/mac80211/patches/608-add_platform_data_mac_addr.patch @@ -31,7 +31,7 @@ { --- a/drivers/net/wireless/rt2x00/rt2x00.h +++ b/drivers/net/wireless/rt2x00/rt2x00.h -@@ -1314,6 +1314,7 @@ static inline void rt2x00debug_dump_fram +@@ -1337,6 +1337,7 @@ static inline void rt2x00debug_dump_fram */ u32 rt2x00lib_get_bssidx(struct rt2x00_dev *rt2x00dev, struct ieee80211_vif *vif); @@ -41,15 +41,15 @@ * Interrupt context handlers. --- a/drivers/net/wireless/rt2x00/rt61pci.c +++ b/drivers/net/wireless/rt2x00/rt61pci.c -@@ -2392,6 +2392,7 @@ static int rt61pci_validate_eeprom(struc +@@ -2396,6 +2396,7 @@ static int rt61pci_validate_eeprom(struc u32 reg; u16 word; u8 *mac; + const u8 *pdata_mac; s8 value; - rt2x00pci_register_read(rt2x00dev, E2PROM_CSR, ®); -@@ -2412,7 +2413,11 @@ static int rt61pci_validate_eeprom(struc + rt2x00mmio_register_read(rt2x00dev, E2PROM_CSR, ®); +@@ -2416,7 +2417,11 @@ static int rt61pci_validate_eeprom(struc /* * Start validation of the data that has been read. */ |