projects
/
oweals
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
hostapd: update to version 2018-12-02 (2.7)
[oweals/openwrt.git]
/
package
/
network
/
services
/
hostapd
/
patches
/
200-multicall.patch
diff --git
a/package/network/services/hostapd/patches/200-multicall.patch
b/package/network/services/hostapd/patches/200-multicall.patch
index 273af644c61e2b0f3c368d01e837fa71655b273e..9c7936695a16f7595fd45df1284ed1d883879cae 100644
(file)
--- a/
package/network/services/hostapd/patches/200-multicall.patch
+++ b/
package/network/services/hostapd/patches/200-multicall.patch
@@
-156,7
+156,7
@@
wpa_cli.exe: wpa_cli
--- a/src/drivers/driver.h
+++ b/src/drivers/driver.h
wpa_cli.exe: wpa_cli
--- a/src/drivers/driver.h
+++ b/src/drivers/driver.h
-@@ -54
49,8 +5449
,8 @@ union wpa_event_data {
+@@ -54
76,8 +5476
,8 @@ union wpa_event_data {
* Driver wrapper code should call this function whenever an event is received
* from the driver.
*/
* Driver wrapper code should call this function whenever an event is received
* from the driver.
*/
@@
-167,7
+167,7
@@
/**
* wpa_supplicant_event_global - Report a driver event for wpa_supplicant
/**
* wpa_supplicant_event_global - Report a driver event for wpa_supplicant
-@@ -54
62,7 +5462
,7 @@ void wpa_supplicant_event(void *ctx, enu
+@@ -54
89,7 +5489
,7 @@ void wpa_supplicant_event(void *ctx, enu
* Same as wpa_supplicant_event(), but we search for the interface in
* wpa_global.
*/
* Same as wpa_supplicant_event(), but we search for the interface in
* wpa_global.
*/
@@
-178,7
+178,7
@@
/*
--- a/src/ap/drv_callbacks.c
+++ b/src/ap/drv_callbacks.c
/*
--- a/src/ap/drv_callbacks.c
+++ b/src/ap/drv_callbacks.c
-@@ -15
15,8 +1515
,8 @@ static void hostapd_event_wds_sta_interf
+@@ -15
27,8 +1527
,8 @@ static void hostapd_event_wds_sta_interf
}
}
@@
-189,7
+189,7
@@
{
struct hostapd_data *hapd = ctx;
#ifndef CONFIG_NO_STDOUT_DEBUG
{
struct hostapd_data *hapd = ctx;
#ifndef CONFIG_NO_STDOUT_DEBUG
-@@ -17
42,7 +1742
,7 @@ void wpa_supplicant_event(void *ctx, enu
+@@ -17
57,7 +1757
,7 @@ void wpa_supplicant_event(void *ctx, enu
}
}
@@
-231,7
+231,7
@@
os_memset(&global, 0, sizeof(global));
--- a/wpa_supplicant/events.c
+++ b/wpa_supplicant/events.c
os_memset(&global, 0, sizeof(global));
--- a/wpa_supplicant/events.c
+++ b/wpa_supplicant/events.c
-@@ -
3976,8 +397
6,8 @@ static void wpas_event_assoc_reject(stru
+@@ -
4026,8 +402
6,8 @@ static void wpas_event_assoc_reject(stru
}
}
@@
-242,7
+242,7
@@
{
struct wpa_supplicant *wpa_s = ctx;
int resched;
{
struct wpa_supplicant *wpa_s = ctx;
int resched;
-@@ -47
45,7 +4745
,7 @@ void wpa_supplicant_event(void *ctx, enu
+@@ -47
96,7 +4796
,7 @@ void wpa_supplicant_event(void *ctx, enu
}
}
@@
-253,7
+253,7
@@
struct wpa_supplicant *wpa_s;
--- a/wpa_supplicant/wpa_supplicant.c
+++ b/wpa_supplicant/wpa_supplicant.c
struct wpa_supplicant *wpa_s;
--- a/wpa_supplicant/wpa_supplicant.c
+++ b/wpa_supplicant/wpa_supplicant.c
-@@ -5
797,7 +5797
,6 @@ struct wpa_interface * wpa_supplicant_ma
+@@ -5
861,7 +5861
,6 @@ struct wpa_interface * wpa_supplicant_ma
return NULL;
}
return NULL;
}
@@
-261,7
+261,7
@@
/**
* wpa_supplicant_match_existing - Match existing interfaces
* @global: Pointer to global data from wpa_supplicant_init()
/**
* wpa_supplicant_match_existing - Match existing interfaces
* @global: Pointer to global data from wpa_supplicant_init()
-@@ -58
34,6 +5833
,11 @@ static int wpa_supplicant_match_existing
+@@ -58
98,6 +5897
,11 @@ static int wpa_supplicant_match_existing
#endif /* CONFIG_MATCH_IFACE */
#endif /* CONFIG_MATCH_IFACE */
@@
-273,7
+273,7
@@
/**
* wpa_supplicant_add_iface - Add a new network interface
/**
* wpa_supplicant_add_iface - Add a new network interface
-@@ -6
090,6 +6094
,8 @@ struct wpa_global * wpa_supplicant_init(
+@@ -6
154,6 +6158
,8 @@ struct wpa_global * wpa_supplicant_init(
#ifndef CONFIG_NO_WPA_MSG
wpa_msg_register_ifname_cb(wpa_supplicant_msg_ifname_cb);
#endif /* CONFIG_NO_WPA_MSG */
#ifndef CONFIG_NO_WPA_MSG
wpa_msg_register_ifname_cb(wpa_supplicant_msg_ifname_cb);
#endif /* CONFIG_NO_WPA_MSG */