aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel/acx-mac80211/patches/200-initial-macaddr.patch
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2013-10-12 10:50:35 +0000
committerJonas Gorski <jogo@openwrt.org>2013-10-12 10:50:35 +0000
commit27c5bbf9930385609cc55ccb15cab19751d9a1b0 (patch)
treed091c20f4993b1181913d2e66b382f8ef8d4b638 /package/kernel/acx-mac80211/patches/200-initial-macaddr.patch
parent99a0dac7f37a99d68692ff5c89157e1fab146cba (diff)
downloadupstream-27c5bbf9930385609cc55ccb15cab19751d9a1b0.tar.gz
upstream-27c5bbf9930385609cc55ccb15cab19751d9a1b0.tar.bz2
upstream-27c5bbf9930385609cc55ccb15cab19751d9a1b0.zip
acx-mac80211: update to latest version
Fixes compilation for linux 3.10. Signed-off-by: Jonas Gorski <jogo@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38367 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/kernel/acx-mac80211/patches/200-initial-macaddr.patch')
-rw-r--r--package/kernel/acx-mac80211/patches/200-initial-macaddr.patch8
1 files changed, 3 insertions, 5 deletions
diff --git a/package/kernel/acx-mac80211/patches/200-initial-macaddr.patch b/package/kernel/acx-mac80211/patches/200-initial-macaddr.patch
index cc82fecbb3..612a87663c 100644
--- a/package/kernel/acx-mac80211/patches/200-initial-macaddr.patch
+++ b/package/kernel/acx-mac80211/patches/200-initial-macaddr.patch
@@ -1,15 +1,13 @@
--- a/cardsetting.c
+++ b/cardsetting.c
-@@ -710,12 +710,27 @@ static int acx1xx_get_station_id(acx_dev
- u8 stationID[4 + acx_ie_descs[ACX1xx_IE_DOT11_STATION_ID].len];
+@@ -710,10 +710,25 @@ static int acx1xx_get_station_id(acx_dev
+ u8 *stationID = adev->ie_cmd_buf;;
const u8 *paddr;
int i, res;
+ const char *prom_addr;
+ char *prom_getenv(const char *name);
-
-
- res = acx_interrogate(adev, &stationID, ACX1xx_IE_DOT11_STATION_ID);
+ res = acx_interrogate(adev, stationID, ACX1xx_IE_DOT11_STATION_ID);
paddr = &stationID[4];
- for (i = 0; i < ETH_ALEN; i++) {
+ prom_addr = NULL;