hostapd: Update to 2.8

[ipfire-2.x.git] / src / patches / hostapd / hostapd-2.8-noscan.patch

diff --git a/src/patches/hostapd/hostapd-2.7-noscan.patch b/src/patches/hostapd/hostapd-2.8-noscan.patch
similarity index 64%
rename from src/patches/hostapd/hostapd-2.7-noscan.patch
rename to src/patches/hostapd/hostapd-2.8-noscan.patch
index 31219c8c5e1b018d172e2af01e213bf11eccc3e7..a323aab47d46ad846a6d4e25a161c94177336d19 100644 (file)
--- a/src/patches/hostapd/hostapd-2.7-noscan.patch
+++ b/src/patches/hostapd/hostapd-2.8-noscan.patch
@@ -1,21 +1,9 @@
-diff U3 a/src/ap/ap_config.h b/src/ap/ap_config.h
---- a/src/ap/ap_config.h       Sun Dec  2 20:34:59 2018
-+++ b/src/ap/ap_config.h       Mon Mar  4 15:58:05 2019
-@@ -779,6 +779,8 @@
- 
-       int ht_op_mode_fixed;
-       u16 ht_capab;
-+      int noscan;
-+      int no_ht_coex;
-       int ieee80211n;
-       int secondary_channel;
-       int no_pri_sec_switch;
-diff U3 a/hostapd/config_file.c b/hostapd/config_file.c
---- a/hostapd/config_file.c    Sun Dec  2 20:34:59 2018
-+++ b/hostapd/config_file.c    Mon Mar  4 15:56:51 2019
-@@ -3317,6 +3317,10 @@
-               }
- #endif /* CONFIG_IEEE80211W */
+diff U3 hostapd/config_file.c hostapd/config_file.c
+--- a/hostapd/config_file.c    Sun Apr 21 09:10:22 2019
++++ b/hostapd/config_file.c    Sun Jun  9 01:08:21 2019
+@@ -3390,6 +3390,10 @@
+                       bss->ieee80211w = 1;
+ #endif /* CONFIG_OCV */
  #ifdef CONFIG_IEEE80211N
 +      } else if (os_strcmp(buf, "noscan") == 0) {
 +              conf->noscan = atoi(pos);
@@ -24,10 +12,22 @@ diff U3 a/hostapd/config_file.c b/hostapd/config_file.c
        } else if (os_strcmp(buf, "ieee80211n") == 0) {
                conf->ieee80211n = atoi(pos);
        } else if (os_strcmp(buf, "ht_capab") == 0) {
-diff U3 a/src/ap/hw_features.c b/src/ap/hw_features.c
---- a/src/ap/hw_features.c     Sun Dec  2 20:34:59 2018
-+++ b/src/ap/hw_features.c     Mon Mar  4 15:59:08 2019
-@@ -480,7 +480,8 @@
+diff U3 src/ap/ap_config.h src/ap/ap_config.h
+--- a/src/ap/ap_config.h       Sun Apr 21 09:10:22 2019
++++ b/src/ap/ap_config.h       Sun Jun  9 01:06:42 2019
+@@ -801,6 +801,8 @@
+ 
+       int ht_op_mode_fixed;
+       u16 ht_capab;
++      int noscan;
++      int no_ht_coex;
+       int ieee80211n;
+       int secondary_channel;
+       int no_pri_sec_switch;
+diff U3 src/ap/hw_features.c src/ap/hw_features.c
+--- a/src/ap/hw_features.c     Sun Apr 21 09:10:22 2019
++++ b/src/ap/hw_features.c     Sun Jun  9 01:09:41 2019
+@@ -477,7 +477,8 @@
        int ret;
  
        /* Check that HT40 is used and PRI / SEC switch is allowed */
@@ -37,9 +37,9 @@ diff U3 a/src/ap/hw_features.c b/src/ap/hw_features.c
                return 0;
  
        hostapd_set_state(iface, HAPD_IFACE_HT_SCAN);
-diff U3 a/src/ap/ieee802_11_ht.c b/src/ap/ieee802_11_ht.c
---- a/src/ap/ieee802_11_ht.c   Sun Dec  2 20:34:59 2018
-+++ b/src/ap/ieee802_11_ht.c   Mon Mar  4 16:02:13 2019
+diff U3 src/ap/ieee802_11_ht.c src/ap/ieee802_11_ht.c
+--- a/src/ap/ieee802_11_ht.c   Sun Apr 21 09:10:22 2019
++++ b/src/ap/ieee802_11_ht.c   Sun Jun  9 01:13:09 2019
 @@ -252,6 +252,9 @@
                return;
        }