hostapd: Update to version 2016-05-05

[openwrt/staging/jogo.git] / package / network / services / hostapd / patches / 450-scan_wait.patch

diff --git a/package/network/services/hostapd/patches/450-scan_wait.patch b/package/network/services/hostapd/patches/450-scan_wait.patch
index 192006a872cc96e68b867a9a34e77052ec2c09a6..3a787e324efb90e0fac1703b4c52e477d76fa636 100644 (file)
--- a/package/network/services/hostapd/patches/450-scan_wait.patch
+++ b/package/network/services/hostapd/patches/450-scan_wait.patch
@@ -33,7 +33,7 @@
        /* Initialize the driver interface */
        if (!(b[0] | b[1] | b[2] | b[3] | b[4] | b[5]))
                b = NULL;
-@@ -382,8 +394,6 @@ static void hostapd_global_deinit(const
+@@ -383,8 +395,6 @@ static void hostapd_global_deinit(const
  #endif /* CONFIG_NATIVE_WINDOWS */
  
        eap_server_unregister_methods();
@@ -42,19 +42,26 @@
  }
  
  
-@@ -409,11 +419,6 @@ static int hostapd_global_run(struct hap
+@@ -410,18 +420,6 @@ static int hostapd_global_run(struct hap
        }
  #endif /* EAP_SERVER_TNC */
  
--      if (daemonize && os_daemonize(pid_file)) {
--              wpa_printf(MSG_ERROR, "daemon: %s", strerror(errno));
--              return -1;
+-      if (daemonize) {
+-              if (os_daemonize(pid_file)) {
+-                      wpa_printf(MSG_ERROR, "daemon: %s", strerror(errno));
+-                      return -1;
+-              }
+-              if (eloop_sock_requeue()) {
+-                      wpa_printf(MSG_ERROR, "eloop_sock_requeue: %s",
+-                                 strerror(errno));
+-                      return -1;
+-              }
 -      }
 -
        eloop_run();
  
        return 0;
-@@ -566,8 +571,7 @@ int main(int argc, char *argv[])
+@@ -579,8 +577,7 @@ int main(int argc, char *argv[])
        struct hapd_interfaces interfaces;
        int ret = 1;
        size_t i, j;