hostapd: Update to version 2.8 (2019-04-21)

[openwrt/staging/ynezz.git] / package / network / services / hostapd / patches / 007-mesh-apply-channel-attributes-before-running-Mesh.patch

diff --git a/package/network/services/hostapd/patches/007-mesh-apply-channel-attributes-before-running-Mesh.patch b/package/network/services/hostapd/patches/007-mesh-apply-channel-attributes-before-running-Mesh.patch
index de114953884d6f8829e7b892597fdc815949ef75..443fad944ce583beb4610866442561c1859a6a05 100644 (file)
--- a/package/network/services/hostapd/patches/007-mesh-apply-channel-attributes-before-running-Mesh.patch
+++ b/package/network/services/hostapd/patches/007-mesh-apply-channel-attributes-before-running-Mesh.patch
@@ -1,28 +1,42 @@
-From bdc77efe681d5b88f3256e2bb6e706d4eaf09518 Mon Sep 17 00:00:00 2001
+From 2564184440d9d6041d11a8c7d50b31368634c3bd Mon Sep 17 00:00:00 2001
 From: Peter Oh <peter.oh@bowerswilkins.com>
-Date: Tue, 29 May 2018 14:39:11 -0700
-Subject: [PATCH 07/18] mesh: apply channel attributes before running Mesh
+Date: Mon, 27 Aug 2018 14:28:40 -0700
+Subject: [PATCH] mesh: Apply channel attributes before setup interface
 
-This helps mesh interface initializes with correct
-channel parameters.
+This helps mesh interface initialization with correct channel
+parameters.
 
 Signed-off-by: Peter Oh <peter.oh@bowerswilkins.com>
 ---
- wpa_supplicant/mesh.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ wpa_supplicant/mesh.c | 11 ++++++++---
+ 1 file changed, 8 insertions(+), 3 deletions(-)
 
 --- a/wpa_supplicant/mesh.c
 +++ b/wpa_supplicant/mesh.c
-@@ -338,6 +338,8 @@ static int wpa_supplicant_mesh_init(stru
+@@ -248,7 +248,7 @@ static int wpa_supplicant_mesh_init(stru
+       struct mesh_conf *mconf;
+       int basic_rates_erp[] = { 10, 20, 55, 60, 110, 120, 240, -1 };
+       int rate_len;
+-      int frequency;
++      int frequency, saved_freq;
+ 
+       if (!wpa_s->conf->user_mpm) {
+               /* not much for us to do here */
+@@ -385,6 +385,13 @@ static int wpa_supplicant_mesh_init(stru
                conf->basic_rates[rate_len] = -1;
        }
  
++      /* Handle pri/sec switch frequency within AP configuration parameter
++       * generation without changing the stored network profile in the end. */
++      saved_freq = ssid->frequency;
++      ssid->frequency = frequency;
 +      wpa_supplicant_conf_ap_ht(wpa_s, ssid, conf);
++      ssid->frequency = saved_freq;
 +
-       if (hostapd_setup_interface(ifmsh)) {
-               wpa_printf(MSG_ERROR,
-                          "Failed to initialize hostapd interface for mesh");
-@@ -349,8 +351,6 @@ static int wpa_supplicant_mesh_init(stru
+       if (wpa_drv_init_mesh(wpa_s)) {
+               wpa_msg(wpa_s, MSG_ERROR, "Failed to init mesh in driver");
+               return -1;
+@@ -396,8 +403,6 @@ static int wpa_supplicant_mesh_init(stru
                return -1;
        }