qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-30 18:14:04 +02:00
Code

hostapd: fix bridge handling for wds stations (#9257), backport of r26724

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@26726 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd 2011-04-19 15:43:24 +00:00
parent 7733904278
commit 7262a5c229
1 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
package/hostapd/patches/730-fix_wds_bridge_handling.patch Normal file
View File

@ -0,0 +1,29 @@
--- a/src/drivers/driver_nl80211.c
+++ b/src/drivers/driver_nl80211.c
@@ -5487,6 +5487,9 @@ static int i802_set_wds_sta(void *priv,
linux_set_iface_flags(drv->ioctl_sock, name, 1);
return i802_set_sta_vlan(priv, addr, name, 0);
} else {
+ if (bridge_ifname)
+ linux_br_del_if(drv->ioctl_sock, bridge_ifname, name);
+
i802_set_sta_vlan(priv, addr, bss->ifname, 0);
return wpa_driver_nl80211_if_remove(priv, WPA_IF_AP_VLAN,
name);
@@ -5927,14 +5930,14 @@ static int wpa_driver_nl80211_if_remove(
return -1;
#ifdef HOSTAPD
- if (bss->added_if_into_bridge) {
+ if (type == WPA_IF_AP_BSS && bss->added_if_into_bridge) {
if (linux_br_del_if(drv->ioctl_sock, bss->brname, bss->ifname)
< 0)
wpa_printf(MSG_INFO, "nl80211: Failed to remove "
"interface %s from bridge %s: %s",
bss->ifname, bss->brname, strerror(errno));
}
- if (bss->added_bridge) {
+ if (type == WPA_IF_AP_BSS && bss->added_bridge) {
if (linux_br_del(drv->ioctl_sock, bss->brname) < 0)
wpa_printf(MSG_INFO, "nl80211: Failed to remove "
"bridge %s: %s",