diff mbox series

[v7,12/13] mesh: fix channel switch error during CAC

Message ID 42ee9e12cda956936a95193b2d121d5453df265d.1530660888.git.peter.oh@bowerswilkins.com
State Superseded
Headers show
Series mesh: enable DFS channels in mesh mode | expand

Commit Message

Peter Oh July 3, 2018, 11:40 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 | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
diff mbox series

Patch

diff --git a/wpa_supplicant/mesh.c b/wpa_supplicant/mesh.c
index c70d1ef..a608263 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"
@@ -199,10 +200,35 @@  static int wpas_mesh_init_rsn(struct wpa_supplicant *wpa_s)
 static void wpas_mesh_complete_cb(void *ctx)
 {
 	struct wpa_supplicant *wpa_s = (struct wpa_supplicant *)ctx;
+	struct hostapd_iface *ifmsh = wpa_s->ifmsh;
 	struct wpa_driver_mesh_join_params *params = wpa_s->mesh_params;
 	struct wpa_ssid *ssid = wpa_s->current_ssid;
 	int ret = 0;
 
+	/*
+	 * 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;
+		if (hostapd_set_freq_params(&params->freq,
+				ifmsh->conf->hw_mode,
+				ifmsh->freq,
+				ifmsh->conf->channel,
+				ifmsh->conf->ieee80211n,
+				ifmsh->conf->ieee80211ac,
+				ifmsh->conf->secondary_channel,
+				ifmsh->conf->vht_oper_chwidth,
+				ifmsh->conf->vht_oper_centr_freq_seg0_idx,
+				ifmsh->conf->vht_oper_centr_freq_seg1_idx,
+				ifmsh->conf->vht_capab)) {
+			wpa_printf(MSG_ERROR, "Error updating mesh frequency params.");
+			wpa_supplicant_mesh_deinit(wpa_s);
+			return;
+		}
+	}
+
 	if (wpas_mesh_init_rsn(wpa_s)) {
 		wpa_printf(MSG_ERROR, "Init RSN failed. Deinit mesh...");
 		wpa_supplicant_mesh_deinit(wpa_s);