aboutsummaryrefslogtreecommitdiffstats
path: root/package/mac80211/patches/608-add_platform_data_mac_addr.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2012-09-08 11:10:54 +0000
committerFelix Fietkau <nbd@openwrt.org>2012-09-08 11:10:54 +0000
commitb4f512b67c2ed5e8d3a8cedefb76193e3e699e1b (patch)
tree8c49adee2d02a47208f7d920f1fff9941c0f3f50 /package/mac80211/patches/608-add_platform_data_mac_addr.patch
parent2daf0ae2046f31ef96f2a413955032e0cded60f1 (diff)
downloadupstream-b4f512b67c2ed5e8d3a8cedefb76193e3e699e1b.tar.gz
upstream-b4f512b67c2ed5e8d3a8cedefb76193e3e699e1b.tar.bz2
upstream-b4f512b67c2ed5e8d3a8cedefb76193e3e699e1b.zip
mac80211: update to 2012-09-07, adds ath9k beacon fixes, mesh/adhoc fixes, and more
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33331 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.patch6
1 files changed, 3 insertions, 3 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 5008180f7d..c1b22e7a25 100644
--- a/package/mac80211/patches/608-add_platform_data_mac_addr.patch
+++ b/package/mac80211/patches/608-add_platform_data_mac_addr.patch
@@ -41,7 +41,7 @@
* Interrupt context handlers.
--- a/drivers/net/wireless/rt2x00/rt61pci.c
+++ b/drivers/net/wireless/rt2x00/rt61pci.c
-@@ -2393,6 +2393,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;
rt2x00pci_register_read(rt2x00dev, E2PROM_CSR, &reg);
-@@ -2413,7 +2414,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.
*/
@@ -59,5 +59,5 @@
+ memcpy(mac, pdata_mac, 6);
+
if (!is_valid_ether_addr(mac)) {
- random_ether_addr(mac);
+ eth_random_addr(mac);
EEPROM(rt2x00dev, "MAC: %pM\n", mac);