From: Peter Oh Date: Mon, 27 Aug 2018 21:28:39 +0000 (-0700) Subject: mesh: Reflect country setting to mesh configuration for DFS X-Git-Tag: hostap_2_8~586 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fed51174d6fd3e2b2d7edd3cefb384328e0d325a;p=thirdparty%2Fhostap.git mesh: Reflect country setting to mesh configuration for DFS wpa_supplicant configuration has country parameter that is supposed to be used in AP mode to indicate supporting IEEE 802.11h and 802.11d. Reflect this configuration to Mesh also since Mesh is required to support 802.11h and 802.11d to use DFS channels. Signed-off-by: Peter Oh --- diff --git a/wpa_supplicant/mesh.c b/wpa_supplicant/mesh.c index e0ccb0f3f..f2f09614d 100644 --- a/wpa_supplicant/mesh.c +++ b/wpa_supplicant/mesh.c @@ -299,6 +299,16 @@ static int wpa_supplicant_mesh_init(struct wpa_supplicant *wpa_s, bss->conf->start_disabled = 1; bss->conf->mesh = MESH_ENABLED; bss->conf->ap_max_inactivity = wpa_s->conf->mesh_max_inactivity; + + if (ieee80211_is_dfs(ssid->frequency, wpa_s->hw.modes, + wpa_s->hw.num_modes) && wpa_s->conf->country[0]) { + conf->ieee80211h = 1; + conf->ieee80211d = 1; + conf->country[0] = wpa_s->conf->country[0]; + conf->country[1] = wpa_s->conf->country[1]; + conf->country[2] = ' '; + } + bss->iconf = conf; ifmsh->conf = conf;