hostapd: refresh patches

[openwrt/openwrt.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..ac874ad66a4b774565741aa52f8ffbfef33b29ff 100644 (file)
--- a/package/network/services/hostapd/patches/450-scan_wait.patch
+++ b/package/network/services/hostapd/patches/450-scan_wait.patch
@@ -1,6 +1,6 @@
 --- a/hostapd/main.c
 +++ b/hostapd/main.c
-@@ -37,6 +37,8 @@ struct hapd_global {
+@@ -39,6 +39,8 @@ struct hapd_global {
  };
  
  static struct hapd_global global;
@@ -9,7 +9,7 @@
  
  
  #ifndef CONFIG_NO_HOSTAPD_LOGGER
-@@ -143,6 +145,14 @@ static void hostapd_logger_cb(void *ctx,
+@@ -146,6 +148,14 @@ static void hostapd_logger_cb(void *ctx,
  }
  #endif /* CONFIG_NO_HOSTAPD_LOGGER */
  
@@ -24,7 +24,7 @@
  
  /**
   * hostapd_driver_init - Preparate driver interface
-@@ -161,6 +171,8 @@ static int hostapd_driver_init(struct ho
+@@ -164,6 +174,8 @@ static int hostapd_driver_init(struct ho
                return -1;
        }
  
@@ -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
+@@ -404,8 +416,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
+@@ -431,18 +441,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[])
+@@ -645,8 +643,7 @@ int main(int argc, char *argv[])
        struct hapd_interfaces interfaces;
        int ret = 1;
        size_t i, j;