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

   1 From eb9888ba41faaeb8fd07392ad46808b7d894cc14 Mon Sep 17 00:00:00 2001
   2 From: Peter Oh <peter.oh@bowerswilkins.com>
   3 Date: Tue, 29 May 2018 14:39:12 -0700
   4 Subject: [PATCH 08/18] mesh: set interface type to mesh before setting
   5  interface
   6
   7 Correct interface type is required to start DFS CAC that can be
   8 triggered during interface setup.
   9
  10 Signed-off-by: Peter Oh <peter.oh@bowerswilkins.com>
  11 ---
  12  wpa_supplicant/mesh.c | 10 +++++-----
  13  1 file changed, 5 insertions(+), 5 deletions(-)
  14
  15 --- a/wpa_supplicant/mesh.c
  16 +++ b/wpa_supplicant/mesh.c
  17 @@ -340,14 +340,14 @@ static int wpa_supplicant_mesh_init(stru
  18
  19         wpa_supplicant_conf_ap_ht(wpa_s, ssid, conf);
  20
  21 -       if (hostapd_setup_interface(ifmsh)) {
  22 -               wpa_printf(MSG_ERROR,
  23 -                          "Failed to initialize hostapd interface for mesh");
  24 +       if (wpa_drv_init_mesh(wpa_s)) {
  25 +               wpa_msg(wpa_s, MSG_ERROR, "Failed to init mesh in driver");
  26                 return -1;
  27         }
  28
  29 -       if (wpa_drv_init_mesh(wpa_s)) {
  30 -               wpa_msg(wpa_s, MSG_ERROR, "Failed to init mesh in driver");
  31 +       if (hostapd_setup_interface(ifmsh)) {
  32 +               wpa_printf(MSG_ERROR,
  33 +                          "Failed to initialize hostapd interface for mesh");
  34                 return -1;
  35         }
  36