hostapd: fix mesh+AP

[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 3bd6eaf340d90b1dfda914bb39b622578ec4a6d7..bd28fb8de94dba5657f3a11ab1060e4d6c09fd94 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
@@ -31,13 +31,11 @@ Signed-off-by: Peter Oh <peter.oh@bowerswilkins.com>
  wpa_supplicant/wpa_supplicant.c | 18 +++++++++++++-----
  1 file changed, 13 insertions(+), 5 deletions(-)
 
-diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c
-index ca893f942..8429cfd43 100644
 --- a/wpa_supplicant/wpa_supplicant.c
 +++ b/wpa_supplicant/wpa_supplicant.c
-@@ -2132,9 +2132,15 @@ void ibss_mesh_setup_freq(struct wpa_supplicant *wpa_s,
-       if (pri_chan->flag & (HOSTAPD_CHAN_DISABLED | HOSTAPD_CHAN_NO_IR))
-               return;
+@@ -2117,9 +2117,15 @@ void ibss_mesh_setup_freq(struct wpa_sup
+               if (!dfs_enabled)
+                       return;
  
 +      freq->channel = pri_chan->chan;
 +
@@ -53,16 +51,16 @@ index ca893f942..8429cfd43 100644
  #endif /* CONFIG_HT_OVERRIDES */
  
        /* Check/setup HT40+/HT40- */
-@@ -2159,8 +2165,6 @@ void ibss_mesh_setup_freq(struct wpa_supplicant *wpa_s,
-       if (sec_chan->flag & (HOSTAPD_CHAN_DISABLED | HOSTAPD_CHAN_NO_IR))
-               return;
+@@ -2147,8 +2153,6 @@ void ibss_mesh_setup_freq(struct wpa_sup
+               if (!dfs_enabled)
+                       return;
  
 -      freq->channel = pri_chan->chan;
 -
        if (ht40 == -1) {
                if (!(pri_chan->flag & HOSTAPD_CHAN_HT40MINUS))
                        return;
-@@ -2204,6 +2208,7 @@ void ibss_mesh_setup_freq(struct wpa_supplicant *wpa_s,
+@@ -2192,6 +2196,7 @@ void ibss_mesh_setup_freq(struct wpa_sup
                wpa_scan_results_free(scan_res);
        }
  
@@ -70,7 +68,7 @@ index ca893f942..8429cfd43 100644
        wpa_printf(MSG_DEBUG,
                   "IBSS/mesh: setup freq channel %d, sec_channel_offset %d",
                   freq->channel, freq->sec_channel_offset);
-@@ -2295,7 +2300,10 @@ void ibss_mesh_setup_freq(struct wpa_supplicant *wpa_s,
+@@ -2287,7 +2292,10 @@ void ibss_mesh_setup_freq(struct wpa_sup
                }
        } else if (ssid->max_oper_chwidth == VHT_CHANWIDTH_USE_HT) {
                chwidth = VHT_CHANWIDTH_USE_HT;
@@ -82,6 +80,3 @@ index ca893f942..8429cfd43 100644
        }
  
        if (hostapd_set_freq_params(&vht_freq, mode->mode, freq->freq,
--- 
-2.17.0
-