1 --- a/src/drivers/driver_nl80211.c
2 +++ b/src/drivers/driver_nl80211.c
3 @@ -5660,6 +5660,9 @@ static int i802_set_wds_sta(void *priv,
4 linux_set_iface_flags(drv->ioctl_sock, name, 1);
5 return i802_set_sta_vlan(priv, addr, name, 0);
8 + linux_br_del_if(drv->ioctl_sock, bridge_ifname, name);
10 i802_set_sta_vlan(priv, addr, bss->ifname, 0);
11 return wpa_driver_nl80211_if_remove(priv, WPA_IF_AP_VLAN,
13 @@ -6021,14 +6024,14 @@ static int wpa_driver_nl80211_if_remove(
17 - if (bss->added_if_into_bridge) {
18 + if (type == WPA_IF_AP_BSS && bss->added_if_into_bridge) {
19 if (linux_br_del_if(drv->ioctl_sock, bss->brname, bss->ifname)
21 wpa_printf(MSG_INFO, "nl80211: Failed to remove "
22 "interface %s from bridge %s: %s",
23 bss->ifname, bss->brname, strerror(errno));
25 - if (bss->added_bridge) {
26 + if (type == WPA_IF_AP_BSS && bss->added_bridge) {
27 if (linux_br_del(drv->ioctl_sock, bss->brname) < 0)
28 wpa_printf(MSG_INFO, "nl80211: Failed to remove "