hostapd: update to version 2018-12-02 (2.7)

[openwrt/openwrt.git] / package / network / services / hostapd / patches / 032-mesh-implement-use-of-VHT20-config-in-mesh-mode.patch

diff --git a/package/network/services/hostapd/patches/032-mesh-implement-use-of-VHT20-config-in-mesh-mode.patch b/package/network/services/hostapd/patches/032-mesh-implement-use-of-VHT20-config-in-mesh-mode.patch
index bd28fb8de94dba5657f3a11ab1060e4d6c09fd94..4691a7940469d5e4ce50998b64915374b8db52ba 100644 (file)
--- a/package/network/services/hostapd/patches/032-mesh-implement-use-of-VHT20-config-in-mesh-mode.patch
+++ b/package/network/services/hostapd/patches/032-mesh-implement-use-of-VHT20-config-in-mesh-mode.patch
@@ -33,7 +33,7 @@ Signed-off-by: Peter Oh <peter.oh@bowerswilkins.com>
 
 --- a/wpa_supplicant/wpa_supplicant.c
 +++ b/wpa_supplicant/wpa_supplicant.c
-@@ -2117,9 +2117,15 @@ void ibss_mesh_setup_freq(struct wpa_sup
+@@ -2174,9 +2174,15 @@ void ibss_mesh_setup_freq(struct wpa_sup
                if (!dfs_enabled)
                        return;
  
@@ -51,7 +51,7 @@ Signed-off-by: Peter Oh <peter.oh@bowerswilkins.com>
  #endif /* CONFIG_HT_OVERRIDES */
  
        /* Check/setup HT40+/HT40- */
-@@ -2147,8 +2153,6 @@ void ibss_mesh_setup_freq(struct wpa_sup
+@@ -2204,8 +2210,6 @@ void ibss_mesh_setup_freq(struct wpa_sup
                if (!dfs_enabled)
                        return;
  
@@ -60,7 +60,7 @@ Signed-off-by: Peter Oh <peter.oh@bowerswilkins.com>
        if (ht40 == -1) {
                if (!(pri_chan->flag & HOSTAPD_CHAN_HT40MINUS))
                        return;
-@@ -2192,6 +2196,7 @@ void ibss_mesh_setup_freq(struct wpa_sup
+@@ -2249,6 +2253,7 @@ void ibss_mesh_setup_freq(struct wpa_sup
                wpa_scan_results_free(scan_res);
        }
  
@@ -68,7 +68,7 @@ Signed-off-by: Peter Oh <peter.oh@bowerswilkins.com>
        wpa_printf(MSG_DEBUG,
                   "IBSS/mesh: setup freq channel %d, sec_channel_offset %d",
                   freq->channel, freq->sec_channel_offset);
-@@ -2287,7 +2292,10 @@ void ibss_mesh_setup_freq(struct wpa_sup
+@@ -2344,7 +2349,10 @@ void ibss_mesh_setup_freq(struct wpa_sup
                }
        } else if (ssid->max_oper_chwidth == VHT_CHANWIDTH_USE_HT) {
                chwidth = VHT_CHANWIDTH_USE_HT;