aboutsummaryrefslogtreecommitdiffstats
path: root/package/acx-mac80211/patches/200-initial-macaddr.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@openwrt.org>2013-07-12 13:10:43 +0000
committerHauke Mehrtens <hauke@openwrt.org>2013-07-12 13:10:43 +0000
commit32f8e1d2dfca21641364cf59b58a6fc28912aacc (patch)
tree82b08c41a7de466904ad000490fe636383b546a9 /package/acx-mac80211/patches/200-initial-macaddr.patch
parentd1af787dc992741bffa1a1ce0b4ca7eacb1f7227 (diff)
downloadupstream-32f8e1d2dfca21641364cf59b58a6fc28912aacc.tar.gz
upstream-32f8e1d2dfca21641364cf59b58a6fc28912aacc.tar.bz2
upstream-32f8e1d2dfca21641364cf59b58a6fc28912aacc.zip
AA: acx-mac80211: make it compile with recent mac80211 again
backport of r35332, r36481 and r36976 git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@37267 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/acx-mac80211/patches/200-initial-macaddr.patch')
-rw-r--r--package/acx-mac80211/patches/200-initial-macaddr.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/package/acx-mac80211/patches/200-initial-macaddr.patch b/package/acx-mac80211/patches/200-initial-macaddr.patch
index 498c72dd85..cc82fecbb3 100644
--- a/package/acx-mac80211/patches/200-initial-macaddr.patch
+++ b/package/acx-mac80211/patches/200-initial-macaddr.patch
@@ -1,6 +1,6 @@
---- a/cardsetting.c 2012-07-03 16:21:25.934102662 -0700
-+++ b/cardsetting.c 2012-07-03 16:49:26.910438174 -0700
-@@ -710,12 +710,27 @@
+--- 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];
const u8 *paddr;
int i, res;