From: Felix Fietkau <nbd@openwrt.org>
Date: Sat, 16 Feb 2013 19:00:34 +0000 (+0000)
Subject: hostapd: fix the scan wait patch for multiple interfaces
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=1d6574b9c3fb992b9bf509d02c76e9250834ae24;p=openwrt%2Fstaging%2Frobimarko.git

hostapd: fix the scan wait patch for multiple interfaces

SVN-Revision: 35630
---

diff --git a/package/network/services/hostapd/patches/620-scan_wait.patch b/package/network/services/hostapd/patches/620-scan_wait.patch
index 5dd874ac0e..d9c7f30104 100644
--- a/package/network/services/hostapd/patches/620-scan_wait.patch
+++ b/package/network/services/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;