hostapd: bring back mesh patches

[oweals/openwrt.git] / package / network / services / hostapd / patches / 420-indicate-features.patch

diff --git a/package/network/services/hostapd/patches/420-indicate-features.patch b/package/network/services/hostapd/patches/420-indicate-features.patch
index 234537a7bc8f3fcd9d2a01957dd16be11feb4ba7..9f216347f4177492b6316e74e66b064daa491c6b 100644 (file)
--- a/package/network/services/hostapd/patches/420-indicate-features.patch
+++ b/package/network/services/hostapd/patches/420-indicate-features.patch
@@ -8,16 +8,16 @@
  #include "crypto/random.h"
  #include "crypto/tls.h"
  #include "common/version.h"
-@@ -593,7 +594,7 @@ int main(int argc, char *argv[])
- 
+@@ -692,7 +693,7 @@ int main(int argc, char *argv[])
        wpa_supplicant_event = hostapd_wpa_event;
+       wpa_supplicant_event_global = hostapd_wpa_event_global;
        for (;;) {
--              c = getopt(argc, argv, "b:Bde:f:hKP:STtu:vg:G:");
-+              c = getopt(argc, argv, "b:Bde:f:hKP:STtu:g:G:v::");
+-              c = getopt(argc, argv, "b:Bde:f:hi:KP:sSTtu:vg:G:");
++              c = getopt(argc, argv, "b:Bde:f:hi:KP:sSTtu:g:G:v::");
                if (c < 0)
                        break;
                switch (c) {
-@@ -630,6 +631,8 @@ int main(int argc, char *argv[])
+@@ -729,6 +730,8 @@ int main(int argc, char *argv[])
                        break;
  #endif /* CONFIG_DEBUG_LINUX_TRACING */
                case 'v':
@@ -36,18 +36,18 @@
  #include "fst/fst.h"
  #include "wpa_supplicant_i.h"
  #include "driver_i.h"
-@@ -177,7 +178,7 @@ int main(int argc, char *argv[])
+@@ -202,7 +203,7 @@ int main(int argc, char *argv[])
  
        for (;;) {
                c = getopt(argc, argv,
--                         "b:Bc:C:D:de:f:g:G:hH:i:I:KLm:No:O:p:P:qsTtuvW");
-+                         "b:Bc:C:D:de:f:g:G:hH:i:I:KLm:No:O:p:P:qsTtuv::W");
+-                         "b:Bc:C:D:de:f:g:G:hH:i:I:KLMm:No:O:p:P:qsTtuvW");
++                         "b:Bc:C:D:de:f:g:G:hH:i:I:KLMm:No:O:p:P:qsTtuv::W");
                if (c < 0)
                        break;
                switch (c) {
-@@ -280,8 +281,12 @@ int main(int argc, char *argv[])
+@@ -305,8 +306,12 @@ int main(int argc, char *argv[])
                        break;
- #endif /* CONFIG_DBUS */
+ #endif /* CONFIG_CTRL_IFACE_DBUS_NEW */
                case 'v':
 -                      printf("%s\n", wpa_supplicant_version);
 -                      exitcode = 0;
@@ -60,23 +60,3 @@
                        goto out;
                case 'W':
                        params.wait_for_monitor++;
---- /dev/null
-+++ b/src/utils/build_features.h
-@@ -0,0 +1,17 @@
-+#ifndef BUILD_FEATURES_H
-+#define BUILD_FEATURES_H
-+
-+static inline int has_feature(const char *feat)
-+{
-+#ifdef IEEE8021X_EAPOL
-+      if (!strcmp(feat, "eap"))
-+              return 1;
-+#endif
-+#ifdef IEEE80211N
-+      if (!strcmp(feat, "11n"))
-+              return 1;
-+#endif
-+      return 0;
-+}
-+
-+#endif /* BUILD_FEATURES_H */