diff mbox series

[v2,05/12] mesh: fix channel switch error during CAC

Message ID 20200630121907.132751-6-markus.theil@tu-ilmenau.de
State Accepted
Headers show
Series mesh: support for DFS | expand

Commit Message

Markus Theil June 30, 2020, 12:19 p.m. UTC 
From: Peter Oh <peter.oh@bowerswilkins.com>

Mesh interface has used its channel parameters that configured
during its initialization even after channel switched due to
DFS radar detection during CAC which caused channel switch error.
This change fixes the error by updating its channel parameters
when channel's been changed from initial one.

Signed-off-by: Peter Oh <peter.oh@bowerswilkins.com>
---
 wpa_supplicant/mesh.c | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)
diff mbox series

Patch

diff --git a/wpa_supplicant/mesh.c b/wpa_supplicant/mesh.c
index 778541bc0..15c285812 100644
--- a/wpa_supplicant/mesh.c
+++ b/wpa_supplicant/mesh.c
@@ -13,6 +13,7 @@ 
 #include "utils/uuid.h"
 #include "common/ieee802_11_defs.h"
 #include "common/wpa_ctrl.h"
+#include "common/hw_features_common.h"
 #include "ap/sta_info.h"
 #include "ap/hostapd.h"
 #include "ap/ieee802_11.h"
@@ -206,6 +207,39 @@  static int wpas_mesh_complete(struct wpa_supplicant *wpa_s)
 		return -1;
 	}
 
+	/*
+	 * inspect if channel's been changed since initialized.
+	 * i.e. DFS radar detection
+	 */
+	if (ifmsh->freq != params->freq.freq) {
+		wpa_s->assoc_freq = ifmsh->freq;
+		ssid->frequency = ifmsh->freq;
+		struct he_capabilities *he_capab = NULL;
+
+		if (ifmsh->current_mode)
+			he_capab = &ifmsh->current_mode->he_capab[IEEE80211_MODE_MESH];
+
+		if (hostapd_set_freq_params(&params->freq,
+				ifmsh->conf->hw_mode,
+				ifmsh->freq,
+				ifmsh->conf->channel,
+				ifmsh->conf->enable_edmg,
+				ifmsh->conf->edmg_channel,
+				ifmsh->conf->ieee80211n,
+				ifmsh->conf->ieee80211ac,
+				ifmsh->conf->ieee80211ax,
+				ifmsh->conf->secondary_channel,
+				hostapd_get_oper_chwidth(ifmsh->conf),
+				hostapd_get_oper_centr_freq_seg0_idx(ifmsh->conf),
+				hostapd_get_oper_centr_freq_seg1_idx(ifmsh->conf),
+				ifmsh->conf->vht_capab,
+				he_capab)) {
+			wpa_printf(MSG_ERROR, "Error updating mesh frequency params.");
+			wpa_supplicant_mesh_deinit(wpa_s);
+			return -1;
+		}
+	}
+
 	if (ifmsh->mconf->security != MESH_CONF_SEC_NONE &&
 	    wpas_mesh_init_rsn(wpa_s)) {
 		wpa_printf(MSG_ERROR,