23 lines
872 B
Diff
23 lines
872 B
Diff
--- a/hostapd/config_file.c
|
|
+++ b/hostapd/config_file.c
|
|
@@ -2357,6 +2357,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, "vlan_bridge") == 0) {
|
|
os_strlcpy(bss->vlan_bridge, pos, sizeof(bss->vlan_bridge));
|
|
} else if (os_strcmp(buf, "wds_bridge") == 0) {
|
|
--- a/src/ap/ap_drv_ops.c
|
|
+++ b/src/ap/ap_drv_ops.c
|
|
@@ -340,8 +340,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);
|
|
}
|