Ensure WDS is available on combined backhaul and fronthaul APs

It is valid to configure an AP to be both backhaul and
fronthaul (multi_ap=3), so we should not test for a missing
fronthaul flag but instead test directly for backhaul capability.

Signed-off-by: Stefan Schake <stefan.schake@devolo.de>

diff --git a/src/ap/ieee802_11.c b/src/ap/ieee802_11.c
index 4ec410df66739fa1e1186a47ba2976a49492559c..2defe6c917560da2ab1d0a9796b758e2c93c4fdb 100644 (file)
--- a/src/ap/ieee802_11.c
+++ b/src/ap/ieee802_11.c
@@ -6471,7 +6471,7 @@ static void handle_assoc_cb(struct hostapd_data *hapd,
        /* WPS not supported on backhaul BSS. Disable 4addr mode on fronthaul */
        if ((sta->flags & WLAN_STA_WDS) ||
            (sta->flags & WLAN_STA_MULTI_AP &&
-            !(hapd->conf->multi_ap & FRONTHAUL_BSS) &&
+            (hapd->conf->multi_ap & BACKHAUL_BSS) &&
             !(sta->flags & WLAN_STA_WPS))) {
                int ret;
                char ifname_wds[IFNAMSIZ + 1];

diff --git a/src/ap/sta_info.c b/src/ap/sta_info.c
index d87214ec7626c46c96bb9b1c68e0b0cff79d5afd..4f84839e3c65c1d7265245e756d3eee8b7a666a1 100644 (file)
--- a/src/ap/sta_info.c
+++ b/src/ap/sta_info.c
@@ -199,7 +199,7 @@ void ap_free_sta(struct hostapd_data *hapd, struct sta_info *sta)
 
        if ((sta->flags & WLAN_STA_WDS) ||
            (sta->flags & WLAN_STA_MULTI_AP &&
-            !(hapd->conf->multi_ap & FRONTHAUL_BSS) &&
+            (hapd->conf->multi_ap & BACKHAUL_BSS) &&
             !(sta->flags & WLAN_STA_WPS)))
                hostapd_set_wds_sta(hapd, NULL, sta->addr, sta->aid, 0);