git.openwrt.org Git - openwrt/openwrt.git/blob

   1 From e2f13b1fac9799db83a37fc57df9471d9bb5b711 Mon Sep 17 00:00:00 2001
   2 From: Peter Oh <peter.oh@bowerswilkins.com>
   3 Date: Tue, 17 Apr 2018 21:55:02 -0700
   4 Subject: [PATCH 05/16] mesh: reflect country setting to mesh configuration
   5
   6 wpa_supplicant configuration has country parameter that is
   7 supposed to be used in AP mode to indicate supporting 802.11h
   8 and 802.11d. Reflect this configuration to Mesh also since Mesh
   9 is required to support 802.11h and 802.11d to use DFS channels.
  10
  11 Signed-off-by: Peter Oh <peter.oh@bowerswilkins.com>
  12 ---
  13  wpa_supplicant/mesh.c | 8 ++++++++
  14  1 file changed, 8 insertions(+)
  15
  16 --- a/wpa_supplicant/mesh.c
  17 +++ b/wpa_supplicant/mesh.c
  18 @@ -255,6 +255,15 @@ static int wpa_supplicant_mesh_init(stru
  19         bss->conf->start_disabled = 1;
  20         bss->conf->mesh = MESH_ENABLED;
  21         bss->conf->ap_max_inactivity = wpa_s->conf->mesh_max_inactivity;
  22 +
  23 +       if (ieee80211_is_dfs(ssid->frequency, wpa_s->hw.modes,
  24 +                            wpa_s->hw.num_modes) && wpa_s->conf->country[0]) {
  25 +               conf->ieee80211h = 1;
  26 +               conf->ieee80211d = 1;
  27 +               conf->country[0] = wpa_s->conf->country[0];
  28 +               conf->country[1] = wpa_s->conf->country[1];
  29 +       }
  30 +
  31         bss->iconf = conf;
  32         ifmsh->conf = conf;
  33