diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2013-04-26 10:52:03 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2013-04-26 10:52:03 +0000 |
| commit | 28240cc8d2d2d5d345a9459497dfc3c72379b994 (patch) | |
| tree | 2b493d850864a30c924d148f67413ab20407b8ef /package/mac80211/patches/608-add_platform_data_mac_addr.patch | |
| parent | 4ea4e6bcb036930b3498f7bdf6bc8fcfef112273 (diff) | |
mac80211: update to wireless-testing 2013-04-16 + backports
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36448 3c298f89-4303-0410-b956-a3cf2f4a3e73
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 bb77df9e7..97307f01a 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. */ |