hostapd: permit also channel 7 for 2.5GHz to be set to HT40PLUS

[openwrt/staging/hauke.git] / package / network / services / hostapd / patches / 301-mesh-noscan.patch

diff --git a/package/network/services/hostapd/patches/301-mesh-noscan.patch b/package/network/services/hostapd/patches/301-mesh-noscan.patch
index fac9bffabdf79c5b9a219f2af6459eed7f091e25..c50ffa8490c4e43bd7e2658e80a71799957c8de2 100644 (file)
--- a/package/network/services/hostapd/patches/301-mesh-noscan.patch
+++ b/package/network/services/hostapd/patches/301-mesh-noscan.patch
@@ -1,6 +1,6 @@
 --- a/wpa_supplicant/config.c
 +++ b/wpa_supplicant/config.c
-@@ -2478,6 +2478,7 @@ static const struct parse_data ssid_fiel
+@@ -2600,6 +2600,7 @@ static const struct parse_data ssid_fiel
  #else /* CONFIG_MESH */
        { INT_RANGE(mode, 0, 4) },
  #endif /* CONFIG_MESH */
@@ -10,7 +10,7 @@
        { STR(id_str) },
 --- a/wpa_supplicant/config_file.c
 +++ b/wpa_supplicant/config_file.c
-@@ -866,6 +866,7 @@ static void wpa_config_write_network(FIL
+@@ -775,6 +775,7 @@ static void wpa_config_write_network(FIL
  #endif /* IEEE8021X_EAPOL */
        INT(mode);
        INT(no_auto_peer);
@@ -20,44 +20,47 @@
        INT(enable_edmg);
 --- a/wpa_supplicant/mesh.c
 +++ b/wpa_supplicant/mesh.c
-@@ -368,6 +368,8 @@ static int wpa_supplicant_mesh_init(stru
+@@ -506,6 +506,8 @@ static int wpa_supplicant_mesh_init(stru
                           frequency);
                goto out_free;
        }
-+      if (ssid->noscan)
-+              conf->noscan = 1;
-       if (ssid->ht40)
-               conf->secondary_channel = ssid->ht40;
-       if (conf->hw_mode == HOSTAPD_MODE_IEEE80211A && ssid->vht) {
++      if (conf->noscan)
++              ssid->noscan = 1;
+ 
+       if (ssid->mesh_basic_rates == NULL) {
+               /*
 --- a/wpa_supplicant/wpa_supplicant.c
 +++ b/wpa_supplicant/wpa_supplicant.c
-@@ -2338,12 +2338,12 @@ void ibss_mesh_setup_freq(struct wpa_sup
+@@ -2710,7 +2710,7 @@ static bool ibss_mesh_can_use_vht(struct
+                                 const struct wpa_ssid *ssid,
+                                 struct hostapd_hw_modes *mode)
+ {
+-      if (mode->mode != HOSTAPD_MODE_IEEE80211A)
++      if (mode->mode != HOSTAPD_MODE_IEEE80211A && !(ssid->noscan))
+               return false;
+ 
+       if (!drv_supports_vht(wpa_s, ssid))
+@@ -2783,7 +2783,7 @@ static void ibss_mesh_select_40mhz(struc
+       int i, res;
+       unsigned int j;
+       static const int ht40plus[] = {
+-              36, 44, 52, 60, 100, 108, 116, 124, 132, 149, 157, 165, 173,
++              1, 2, 3, 4, 5, 6, 7, 36, 44, 52, 60, 100, 108, 116, 124, 132, 149, 157, 165, 173,
+               184, 192
+       };
+       int ht40 = -1;
+@@ -3033,7 +3033,7 @@ void ibss_mesh_setup_freq(struct wpa_sup
        int ieee80211_mode = wpas_mode_to_ieee80211_mode(ssid->mode);
        enum hostapd_hw_mode hw_mode;
        struct hostapd_hw_modes *mode = NULL;
--      int ht40plus[] = { 36, 44, 52, 60, 100, 108, 116, 124, 132, 149, 157,
-+      int ht40plus[] = { 1, 2, 3, 4, 5, 6, 36, 44, 52, 60, 100, 108, 116, 124, 132, 149, 157,
-                          184, 192 };
-       int vht80[] = { 36, 52, 100, 116, 132, 149 };
-       struct hostapd_channel_data *pri_chan = NULL, *sec_chan = NULL;
+-      int i, obss_scan = 1;
++      int i, obss_scan = !(ssid->noscan);
        u8 channel;
--      int i, chan_idx, ht40 = -1, res, obss_scan = 1;
-+      int i, chan_idx, ht40 = -1, res, obss_scan = !(ssid->noscan);
-       unsigned int j, k;
-       struct hostapd_freq_params vht_freq;
-       int chwidth, seg0, seg1;
-@@ -2425,7 +2425,7 @@ void ibss_mesh_setup_freq(struct wpa_sup
- #endif /* CONFIG_HE_OVERRIDES */
- 
-       /* Setup higher BW only for 5 GHz */
--      if (mode->mode != HOSTAPD_MODE_IEEE80211A)
-+      if (mode->mode != HOSTAPD_MODE_IEEE80211A && !(ssid->noscan))
-               return;
- 
-       for (chan_idx = 0; chan_idx < mode->num_channels; chan_idx++) {
+       bool is_6ghz;
+       bool dfs_enabled = wpa_s->conf->country[0] && (wpa_s->drv_flags & WPA_DRIVER_FLAGS_RADAR);
 --- a/wpa_supplicant/config_ssid.h
 +++ b/wpa_supplicant/config_ssid.h
-@@ -971,6 +971,8 @@ struct wpa_ssid {
+@@ -1035,6 +1035,8 @@ struct wpa_ssid {
         */
        int no_auto_peer;