36 lines
1.3 KiB
Diff
36 lines
1.3 KiB
Diff
From 5a171ddcfab8d1a51e17e73e322d194c99d12092 Mon Sep 17 00:00:00 2001
|
|
From: OpenEmbedded <oe.patch@oe>
|
|
Date: Thu, 15 Sep 2022 12:35:29 +0000
|
|
|
|
---
|
|
hostapd/config_file.c | 2 ++
|
|
src/ap/ap_drv_ops.c | 2 --
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/hostapd/config_file.c b/hostapd/config_file.c
|
|
index 7fcbb0be3..24f044ae2 100644
|
|
--- a/hostapd/config_file.c
|
|
+++ b/hostapd/config_file.c
|
|
@@ -2312,6 +2312,8 @@ static int hostapd_config_fill(struct hostapd_config *conf,
|
|
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) {
|
|
diff --git a/src/ap/ap_drv_ops.c b/src/ap/ap_drv_ops.c
|
|
index 8af7a0e25..192b30ce1 100644
|
|
--- 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_data *hapd, char *ifname_wds,
|
|
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);
|
|
}
|