d3f8864a7490d38535ca705437b5f21976784860
[openwrt/openwrt.git] / package / network / services / hostapd / patches / 711-wds_bridge_force.patch
1 --- a/hostapd/config_file.c
2 +++ b/hostapd/config_file.c
3 @@ -2357,6 +2357,8 @@ static int hostapd_config_fill(struct ho
4 sizeof(conf->bss[0]->iface));
5 } else if (os_strcmp(buf, "bridge") == 0) {
6 os_strlcpy(bss->bridge, pos, sizeof(bss->bridge));
7 + if (!bss->wds_bridge[0])
8 + os_strlcpy(bss->wds_bridge, pos, sizeof(bss->wds_bridge));
9 } else if (os_strcmp(buf, "vlan_bridge") == 0) {
10 os_strlcpy(bss->vlan_bridge, pos, sizeof(bss->vlan_bridge));
11 } else if (os_strcmp(buf, "wds_bridge") == 0) {
12 --- a/src/ap/ap_drv_ops.c
13 +++ b/src/ap/ap_drv_ops.c
14 @@ -340,8 +340,6 @@ int hostapd_set_wds_sta(struct hostapd_d
15 return -1;
16 if (hapd->conf->wds_bridge[0])
17 bridge = hapd->conf->wds_bridge;
18 - else if (hapd->conf->bridge[0])
19 - bridge = hapd->conf->bridge;
20 return hapd->driver->set_wds_sta(hapd->drv_priv, addr, aid, val,
21 bridge, ifname_wds);
22 }