aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJouni Malinen <jouni@qca.qualcomm.com>2017-02-22 22:19:10 (GMT)
committerJouni Malinen <j@w1.fi>2017-02-26 10:05:40 (GMT)
commit21ed24f5ad3b713d1174a1ce55025b7266ff878d (patch)
tree7b97a92f390f221b4bf3c3159a4dfb2d96cff195 /src
parent659ff340234b5a0e4875dab8e38197ab35256ce2 (diff)
downloadhostap-21ed24f5ad3b713d1174a1ce55025b7266ff878d.zip
hostap-21ed24f5ad3b713d1174a1ce55025b7266ff878d.tar.gz
hostap-21ed24f5ad3b713d1174a1ce55025b7266ff878d.tar.bz2
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>
Diffstat (limited to 'src')
-rw-r--r--src/ap/hostapd.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ap/hostapd.c b/src/ap/hostapd.c
index cf8a8cb..d05dc5c 100644
--- 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 */