Hi again, On Tue, May 29, 2018 at 02:39:20PM -0700, peter.oh@xxxxxxxxxxxxxxxxx wrote: > From: Peter Oh <peter.oh@xxxxxxxxxxxxxxxxx> > > 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@xxxxxxxxxxxxxxxxx> > --- > wpa_supplicant/mesh.c | 25 +++++++++++++++++++++++++ > 1 file changed, 25 insertions(+) This commit introduces a compiler warning, see below. > > diff --git a/wpa_supplicant/mesh.c b/wpa_supplicant/mesh.c > index 90f3b1a..2eaf81f 100644 > --- a/wpa_supplicant/mesh.c > +++ b/wpa_supplicant/mesh.c > @@ -393,10 +393,35 @@ void wpa_supplicant_mesh_add_scan_ie(struct wpa_supplicant *wpa_s, > 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(¶ms->freq, mesh.c: In function 'wpas_mesh_complete_cb': mesh.c:413:7: warning: implicit declaration of function 'hostapd_set_freq_params'; did you mean 'hostapd_set_security_params'? [-Wimplicit-function-declaration] if (hostapd_set_freq_params(¶ms->freq, ^~~~~~~~~~~~~~~~~~~~~~~ hostapd_set_security_params You need to include "common/hw_features_common.h" in mesh.c for hostapd_set_freq_params to be declared. > + 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); > -- > 2.7.4 > > > _______________________________________________ > Hostap mailing list > Hostap@xxxxxxxxxxxxxxxxxxx > http://lists.infradead.org/mailman/listinfo/hostap _______________________________________________ Hostap mailing list Hostap@xxxxxxxxxxxxxxxxxxx http://lists.infradead.org/mailman/listinfo/hostap