hostapd: fix the scan wait patch for multiple interfaces

Backport of r35630

SVN-Revision: 35631

diff --git a/package/hostapd/patches/620-scan_wait.patch b/package/hostapd/patches/620-scan_wait.patch
index 5dd874ac0e828c1d6b6bb49916e70848bc4fbae6..d9c7f301044f3fc68e90ba1da8a60c1eac6542f6 100644 (file)
--- a/package/hostapd/patches/620-scan_wait.patch
+++ b/package/hostapd/patches/620-scan_wait.patch
@@ -9,9 +9,9 @@
  
  extern struct wpa_driver_ops *wpa_drivers[];
  
-@@ -279,6 +281,14 @@ static int hostapd_driver_init(struct ho
-       return 0;
+@@ -146,6 +148,14 @@ static void hostapd_logger_cb(void *ctx,
  }
+ #endif /* CONFIG_NO_HOSTAPD_LOGGER */
  
 +static void hostapd_setup_complete_cb(void *ctx)
 +{
@@ -22,25 +22,17 @@
 +      daemonize = 0;
 +}
  
- static struct hostapd_iface *
- hostapd_interface_init(struct hapd_interfaces *interfaces,
-@@ -298,6 +308,7 @@ hostapd_interface_init(struct hapd_inter
-                       iface->bss[0]->conf->logger_stdout_level--;
+ /**
+  * hostapd_init - Allocate and initialize per-interface data
+@@ -189,6 +199,7 @@ static struct hostapd_iface * hostapd_in
+               if (hapd == NULL)
+                       goto fail;
+               hapd->msg_ctx = hapd;
++              hapd->setup_complete_cb = hostapd_setup_complete_cb;
        }
  
-+      iface->bss[0]->setup_complete_cb = hostapd_setup_complete_cb;
-       if (iface->conf->bss[0].iface[0] != 0 ||
-           hostapd_drv_none(iface->bss[0])) {
-               if (hostapd_driver_init(iface) ||
-@@ -310,7 +321,6 @@ hostapd_interface_init(struct hapd_inter
-       return iface;
- }
- 
--
- /**
-  * handle_term - SIGINT and SIGTERM handler to terminate hostapd process
-  */
-@@ -425,8 +435,6 @@ static void hostapd_global_deinit(const 
+       return hapd_iface;
+@@ -425,8 +436,6 @@ static void hostapd_global_deinit(const 
  #endif /* CONFIG_NATIVE_WINDOWS */
  
        eap_server_unregister_methods();
@@ -49,7 +41,7 @@
  }
  
  
-@@ -452,11 +460,6 @@ static int hostapd_global_run(struct hap
+@@ -452,11 +461,6 @@ static int hostapd_global_run(struct hap
        }
  #endif /* EAP_SERVER_TNC */
  
@@ -61,7 +53,7 @@
        eloop_run();
  
        return 0;
-@@ -540,8 +543,7 @@ int main(int argc, char *argv[])
+@@ -540,8 +544,7 @@ int main(int argc, char *argv[])
        struct hapd_interfaces interfaces;
        int ret = 1;
        size_t i;