1
0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2025-04-21 12:27:27 +03:00

hostapd: update to latest trunk version (merge r26414, r26415)

git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@26416 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd
2011-04-02 19:45:56 +00:00
parent 3e9da9b162
commit 89d66a66d5
14 changed files with 132 additions and 308 deletions

View File

@@ -132,7 +132,7 @@
wpa_cli.exe: wpa_cli
--- a/src/drivers/driver.h
+++ b/src/drivers/driver.h
@@ -3169,8 +3169,8 @@ union wpa_event_data {
@@ -3186,8 +3186,8 @@ union wpa_event_data {
* Driver wrapper code should call this function whenever an event is received
* from the driver.
*/
@@ -179,7 +179,7 @@
for (;;) {
--- a/wpa_supplicant/events.c
+++ b/wpa_supplicant/events.c
@@ -1718,8 +1718,8 @@ static void wpa_supplicant_event_unprot_
@@ -1734,8 +1734,8 @@ static void wpa_supplicant_event_unprot_
}
@@ -192,7 +192,7 @@
u16 reason_code = 0;
--- a/wpa_supplicant/wpa_supplicant.c
+++ b/wpa_supplicant/wpa_supplicant.c
@@ -2313,6 +2313,9 @@ static void wpa_supplicant_deinit_iface(
@@ -2311,6 +2311,9 @@ static void wpa_supplicant_deinit_iface(
wpa_drv_deinit(wpa_s);
}
@@ -202,7 +202,7 @@
/**
* wpa_supplicant_add_iface - Add a new network interface
@@ -2496,6 +2499,7 @@ struct wpa_global * wpa_supplicant_init(
@@ -2494,6 +2497,7 @@ struct wpa_global * wpa_supplicant_init(
wpa_msg_register_ifname_cb(wpa_supplicant_msg_ifname_cb);
#endif /* CONFIG_NO_WPA_MSG */
@@ -212,7 +212,7 @@
wpa_debug_open_syslog();
--- a/hostapd/main.c
+++ b/hostapd/main.c
@@ -491,6 +491,9 @@ static const char * hostapd_msg_ifname_c
@@ -501,6 +501,9 @@ static const char * hostapd_msg_ifname_c
return NULL;
}
@@ -222,7 +222,7 @@
int main(int argc, char *argv[])
{
@@ -503,6 +506,7 @@ int main(int argc, char *argv[])
@@ -513,6 +516,7 @@ int main(int argc, char *argv[])
if (os_program_init())
return -1;