| --- a/hostapd/config_file.c |
| +++ b/hostapd/config_file.c |
| @@ -2318,6 +2318,8 @@ static int hostapd_config_fill(struct ho |
| sizeof(conf->bss[0]->iface)); |
| } else if (os_strcmp(buf, "bridge") == 0) { |
| os_strlcpy(bss->bridge, pos, sizeof(bss->bridge)); |
| + if (!bss->wds_bridge[0]) |
| + os_strlcpy(bss->wds_bridge, pos, sizeof(bss->wds_bridge)); |
| } else if (os_strcmp(buf, "bridge_hairpin") == 0) { |
| bss->bridge_hairpin = atoi(pos); |
| } else if (os_strcmp(buf, "vlan_bridge") == 0) { |
| --- a/src/ap/ap_drv_ops.c |
| +++ b/src/ap/ap_drv_ops.c |
| @@ -348,8 +348,6 @@ int hostapd_set_wds_sta(struct hostapd_d |
| return -1; |
| if (hapd->conf->wds_bridge[0]) |
| bridge = hapd->conf->wds_bridge; |
| - else if (hapd->conf->bridge[0]) |
| - bridge = hapd->conf->bridge; |
| return hapd->driver->set_wds_sta(hapd->drv_priv, addr, aid, val, |
| bridge, ifname_wds); |
| } |