hostapd: Fix potential mesh-related change from impacting non-mesh cases

Commit 01e2231fdc4fbec61fbc382238e3606a1d2826e4 ('hostapd: Skip some
configuration steps for mesh cases') removed some operations based on
hapd->iface->mconf being NULL. This was within #ifdef CONFIG_MESH, so it
should not impact hostapd, but it can impact AP mode with
wpa_supplicant. That does not sound intentional, so make these
conditional on hapd->conf->mesh being enabled.

Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>

diff --git a/src/ap/hostapd.c b/src/ap/hostapd.c
index cf8a8cb37316fdee05556aa55244c67755af23e7..d05dc5c2417c83e2b89db54c190b64bfdc480922 100644 (file)
--- a/src/ap/hostapd.c
+++ b/src/ap/hostapd.c
@@ -969,7 +969,7 @@ static int hostapd_setup_bss(struct hostapd_data *hapd, int first)
 #endif /* CONFIG_IEEE80211R_AP */
 
 #ifdef CONFIG_MESH
-       if (hapd->iface->mconf == NULL)
+       if ((hapd->conf->mesh & MESH_ENABLED) && hapd->iface->mconf == NULL)
                flush_old_stations = 0;
 #endif /* CONFIG_MESH */
 
@@ -1157,7 +1157,7 @@ static void hostapd_tx_queue_params(struct hostapd_iface *iface)
        struct hostapd_tx_queue_params *p;
 
 #ifdef CONFIG_MESH
-       if (iface->mconf == NULL)
+       if ((hapd->conf->mesh & MESH_ENABLED) && iface->mconf == NULL)
                return;
 #endif /* CONFIG_MESH */