hostapd: update to version 2021-05-21

[openwrt/staging/ynezz.git] / package / network / services / hostapd / patches / 300-noscan.patch

diff --git a/package/network/services/hostapd/patches/300-noscan.patch b/package/network/services/hostapd/patches/300-noscan.patch
index 21d631603b1f4e0af8dc11c3a249fc7d247021f3..93b09342838958c32511698a4668b18533806264 100644 (file)
--- a/package/network/services/hostapd/patches/300-noscan.patch
+++ b/package/network/services/hostapd/patches/300-noscan.patch
@@ -1,9 +1,9 @@
 --- a/hostapd/config_file.c
 +++ b/hostapd/config_file.c
-@@ -2862,6 +2862,10 @@ static int hostapd_config_fill(struct ho
-               }
- #endif /* CONFIG_IEEE80211W */
- #ifdef CONFIG_IEEE80211N
+@@ -3459,6 +3459,10 @@ static int hostapd_config_fill(struct ho
+               if (bss->ocv && !bss->ieee80211w)
+                       bss->ieee80211w = 1;
+ #endif /* CONFIG_OCV */
 +      } else if (os_strcmp(buf, "noscan") == 0) {
 +              conf->noscan = atoi(pos);
 +      } else if (os_strcmp(buf, "ht_coex") == 0) {
@@ -13,7 +13,7 @@
        } else if (os_strcmp(buf, "ht_capab") == 0) {
 --- a/src/ap/ap_config.h
 +++ b/src/ap/ap_config.h
-@@ -655,6 +655,8 @@ struct hostapd_config {
+@@ -1009,6 +1009,8 @@ struct hostapd_config {
  
        int ht_op_mode_fixed;
        u16 ht_capab;
@@ -24,7 +24,7 @@
        int no_pri_sec_switch;
 --- a/src/ap/hw_features.c
 +++ b/src/ap/hw_features.c
-@@ -474,7 +474,8 @@ static int ieee80211n_check_40mhz(struct
+@@ -517,7 +517,8 @@ static int ieee80211n_check_40mhz(struct
        int ret;
  
        /* Check that HT40 is used and PRI / SEC switch is allowed */
@@ -36,17 +36,17 @@
        hostapd_set_state(iface, HAPD_IFACE_HT_SCAN);
 --- a/src/ap/ieee802_11_ht.c
 +++ b/src/ap/ieee802_11_ht.c
-@@ -244,6 +244,9 @@ void hostapd_2040_coex_action(struct hos
-       if (!(iface->conf->ht_capab & HT_CAP_INFO_SUPP_CHANNEL_WIDTH_SET))
+@@ -230,6 +230,9 @@ void hostapd_2040_coex_action(struct hos
                return;
+       }
  
 +      if (iface->conf->noscan || iface->conf->no_ht_coex)
 +              return;
 +
-       if (len < IEEE80211_HDRLEN + 2 + sizeof(*bc_ie))
-               return;
- 
-@@ -368,6 +371,9 @@ void ht40_intolerant_add(struct hostapd_
+       if (len < IEEE80211_HDRLEN + 2 + sizeof(*bc_ie)) {
+               wpa_printf(MSG_DEBUG,
+                          "Ignore too short 20/40 BSS Coexistence Management frame");
+@@ -390,6 +393,9 @@ void ht40_intolerant_add(struct hostapd_
        if (iface->current_mode->mode != HOSTAPD_MODE_IEEE80211G)
                return;