aboutsummaryrefslogtreecommitdiffstats
path: root/package/hostapd
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2010-01-30 16:08:02 +0000
committerFelix Fietkau <nbd@openwrt.org>2010-01-30 16:08:02 +0000
commit74a7c7c3eba4fdf6a70cfc0ed866888a738fbd89 (patch)
treecdc57867ce5699e7cb8e39c7664f36bbff8bdca5 /package/hostapd
parentdcb18f2f9435a8d7ccad5174a74d5cc2a739da62 (diff)
downloadupstream-74a7c7c3eba4fdf6a70cfc0ed866888a738fbd89.tar.gz
upstream-74a7c7c3eba4fdf6a70cfc0ed866888a738fbd89.tar.bz2
upstream-74a7c7c3eba4fdf6a70cfc0ed866888a738fbd89.zip
hostapd: fix segfault in mac80211 wds ap handling
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19420 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/hostapd')
-rw-r--r--package/hostapd/patches/150-mbss_driver_handling.patch7
1 files changed, 4 insertions, 3 deletions
diff --git a/package/hostapd/patches/150-mbss_driver_handling.patch b/package/hostapd/patches/150-mbss_driver_handling.patch
index ccae4e6dbf..412dc1cce9 100644
--- a/package/hostapd/patches/150-mbss_driver_handling.patch
+++ b/package/hostapd/patches/150-mbss_driver_handling.patch
@@ -735,7 +735,7 @@
NLA_PUT(msg, NL80211_ATTR_MAC, ETH_ALEN, addr);
NLA_PUT_U32(msg, NL80211_ATTR_STA_VLAN,
if_nametoindex(ifname));
-@@ -4181,10 +4174,11 @@ static int i802_set_sta_vlan(void *priv,
+@@ -4181,18 +4174,19 @@ static int i802_set_sta_vlan(void *priv,
static int i802_set_wds_sta(void *priv, const u8 *addr, int aid, int val)
{
@@ -747,9 +747,10 @@
- os_snprintf(name, sizeof(name), "%s.sta%d", drv->ifname, aid);
+ os_snprintf(name, sizeof(name), "%s.sta%d", bss->ifname, aid);
if (val) {
- if (nl80211_create_iface(priv, name, NL80211_IFTYPE_AP_VLAN,
+- if (nl80211_create_iface(priv, name, NL80211_IFTYPE_AP_VLAN,
++ if (nl80211_create_iface(drv, name, NL80211_IFTYPE_AP_VLAN,
NULL, 1) < 0)
-@@ -4192,7 +4186,7 @@ static int i802_set_wds_sta(void *priv,
+ return -1;
linux_set_iface_flags(drv->ioctl_sock, name, 1);
return i802_set_sta_vlan(priv, addr, name, 0);
} else {