hostapd: update to 2014-10-25

[openwrt.git] / package / network / services / hostapd / patches / 490-scan_wait.patch

diff --git a/package/network/services/hostapd/patches/490-scan_wait.patch b/package/network/services/hostapd/patches/490-scan_wait.patch
deleted file mode 100644 (file)
index 2c0f284..0000000
--- a/package/network/services/hostapd/patches/490-scan_wait.patch
+++ /dev/null
@@ -1,66 +0,0 @@
---- a/hostapd/main.c
-+++ b/hostapd/main.c
-@@ -36,6 +36,8 @@ struct hapd_global {
- };
- 
- static struct hapd_global global;
-+static int daemonize = 0;
-+static char *pid_file = NULL;
- 
- 
- #ifndef CONFIG_NO_HOSTAPD_LOGGER
-@@ -141,6 +143,14 @@ static void hostapd_logger_cb(void *ctx,
- }
- #endif /* CONFIG_NO_HOSTAPD_LOGGER */
- 
-+static void hostapd_setup_complete_cb(void *ctx)
-+{
-+      if (daemonize && os_daemonize(pid_file)) {
-+              perror("daemon");
-+              return;
-+      }
-+      daemonize = 0;
-+}
- 
- /**
-  * hostapd_driver_init - Preparate driver interface
-@@ -159,6 +169,8 @@ static int hostapd_driver_init(struct ho
-               return -1;
-       }
- 
-+      hapd->setup_complete_cb = hostapd_setup_complete_cb;
-+
-       /* Initialize the driver interface */
-       if (!(b[0] | b[1] | b[2] | b[3] | b[4] | b[5]))
-               b = NULL;
-@@ -372,8 +384,6 @@ static void hostapd_global_deinit(const
- #endif /* CONFIG_NATIVE_WINDOWS */
- 
-       eap_server_unregister_methods();
--
--      os_daemonize_terminate(pid_file);
- }
- 
- 
-@@ -399,11 +409,6 @@ static int hostapd_global_run(struct hap
-       }
- #endif /* EAP_SERVER_TNC */
- 
--      if (daemonize && os_daemonize(pid_file)) {
--              perror("daemon");
--              return -1;
--      }
--
-       eloop_run();
- 
-       return 0;
-@@ -533,8 +538,7 @@ int main(int argc, char *argv[])
-       struct hapd_interfaces interfaces;
-       int ret = 1;
-       size_t i, j;
--      int c, debug = 0, daemonize = 0;
--      char *pid_file = NULL;
-+      int c, debug = 0;
-       const char *log_file = NULL;
-       const char *entropy_file = NULL;
-       char **bss_config = NULL, **tmp_bss;