mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-08-20 16:06:48 +03:00
hostapd: fix segfault in mac80211 wds ap handling
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19420 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
a55ecbe1b9
commit
a95353299c
@ -735,7 +735,7 @@
|
|||||||
NLA_PUT(msg, NL80211_ATTR_MAC, ETH_ALEN, addr);
|
NLA_PUT(msg, NL80211_ATTR_MAC, ETH_ALEN, addr);
|
||||||
NLA_PUT_U32(msg, NL80211_ATTR_STA_VLAN,
|
NLA_PUT_U32(msg, NL80211_ATTR_STA_VLAN,
|
||||||
if_nametoindex(ifname));
|
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)
|
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", drv->ifname, aid);
|
||||||
+ os_snprintf(name, sizeof(name), "%s.sta%d", bss->ifname, aid);
|
+ os_snprintf(name, sizeof(name), "%s.sta%d", bss->ifname, aid);
|
||||||
if (val) {
|
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)
|
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);
|
linux_set_iface_flags(drv->ioctl_sock, name, 1);
|
||||||
return i802_set_sta_vlan(priv, addr, name, 0);
|
return i802_set_sta_vlan(priv, addr, name, 0);
|
||||||
} else {
|
} else {
|
||||||
|
Loading…
Reference in New Issue
Block a user