diff options
author | Felix Fietkau <nbd@openwrt.org> | 2016-01-28 17:19:13 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2016-01-28 17:19:13 +0000 |
commit | 924407b253fdf22ab27e72ae38b4d9513d0191c8 (patch) | |
tree | 2dcdb54af5ac6763a0a5edd0de0548eaeda26690 /package/network/services/hostapd/patches/200-multicall.patch | |
parent | 705ddc9bb944a7ab6ba338984718de2416849a6c (diff) | |
download | mtk-20170518-924407b253fdf22ab27e72ae38b4d9513d0191c8.zip mtk-20170518-924407b253fdf22ab27e72ae38b4d9513d0191c8.tar.gz mtk-20170518-924407b253fdf22ab27e72ae38b4d9513d0191c8.tar.bz2 |
hostapd: update to version 2016-01-15
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 48527
Diffstat (limited to 'package/network/services/hostapd/patches/200-multicall.patch')
-rw-r--r-- | package/network/services/hostapd/patches/200-multicall.patch | 71 |
1 files changed, 39 insertions, 32 deletions
diff --git a/package/network/services/hostapd/patches/200-multicall.patch b/package/network/services/hostapd/patches/200-multicall.patch index de4a3a8..08f1e95 100644 --- a/package/network/services/hostapd/patches/200-multicall.patch +++ b/package/network/services/hostapd/patches/200-multicall.patch @@ -1,14 +1,14 @@ --- a/hostapd/Makefile +++ b/hostapd/Makefile -@@ -17,6 +17,7 @@ export BINDIR ?= /usr/local/bin/ +@@ -32,6 +32,7 @@ export BINDIR ?= /usr/local/bin/ # CFLAGS += -DUSE_KERNEL_HEADERS -I/usr/src/linux/include -include .config +-include $(if $(MULTICALL), ../wpa_supplicant/.config) - ifdef CONFIG_TESTING_OPTIONS - CFLAGS += -DCONFIG_TESTING_OPTIONS -@@ -242,10 +243,14 @@ ifdef CONFIG_IEEE80211AC + ifndef CONFIG_NO_GITVER + # Add VERSION_STR postfix for builds from a git repository +@@ -277,10 +278,14 @@ ifdef CONFIG_IEEE80211AC CFLAGS += -DCONFIG_IEEE80211AC endif @@ -26,7 +26,7 @@ LIBS += $(DRV_AP_LIBS) ifdef CONFIG_L2_PACKET -@@ -941,6 +946,12 @@ install: $(addprefix $(DESTDIR)$(BINDIR) +@@ -1019,6 +1024,12 @@ install: $(addprefix $(DESTDIR)$(BINDIR) BCHECK=../src/drivers/build.hostapd @@ -39,7 +39,7 @@ hostapd: $(BCHECK) $(OBJS) $(Q)$(CC) $(LDFLAGS) -o hostapd $(OBJS) $(LIBS) @$(E) " LD " $@ -@@ -980,6 +991,12 @@ HOBJS += ../src/crypto/aes-internal.o +@@ -1060,6 +1071,12 @@ HOBJS += ../src/crypto/aes-internal.o HOBJS += ../src/crypto/aes-internal-enc.o endif @@ -54,15 +54,15 @@ @$(E) " LD " $@ --- a/wpa_supplicant/Makefile +++ b/wpa_supplicant/Makefile -@@ -15,6 +15,7 @@ CFLAGS += -I$(abspath ../src) +@@ -27,6 +27,7 @@ CFLAGS += -I$(abspath ../src) CFLAGS += -I$(abspath ../src/utils) -include .config +-include $(if $(MULTICALL),../hostapd/.config) - ifdef CONFIG_TESTING_OPTIONS - CFLAGS += -DCONFIG_TESTING_OPTIONS -@@ -773,6 +774,10 @@ ifdef CONFIG_DYNAMIC_EAP_METHODS + ifndef CONFIG_NO_GITVER + # Add VERSION_STR postfix for builds from a git repository +@@ -794,6 +795,10 @@ ifdef CONFIG_DYNAMIC_EAP_METHODS CFLAGS += -DCONFIG_DYNAMIC_EAP_METHODS LIBS += -ldl -rdynamic endif @@ -73,7 +73,7 @@ endif ifdef CONFIG_MACSEC -@@ -793,9 +798,11 @@ NEED_EAP_COMMON=y +@@ -814,9 +819,11 @@ NEED_EAP_COMMON=y NEED_RSN_AUTHENTICATOR=y CFLAGS += -DCONFIG_AP OBJS += ap.o @@ -85,7 +85,7 @@ OBJS += ../src/ap/hostapd.o OBJS += ../src/ap/wpa_auth_glue.o OBJS += ../src/ap/utils.o -@@ -858,10 +865,18 @@ endif +@@ -879,10 +886,18 @@ endif ifdef CONFIG_HS20 OBJS += ../src/ap/hs20.o endif @@ -104,7 +104,7 @@ NEED_AES_WRAP=y OBJS += ../src/ap/wpa_auth.o OBJS += ../src/ap/wpa_auth_ie.o -@@ -1603,6 +1618,12 @@ wpa_priv: $(BCHECK) $(OBJS_priv) +@@ -1657,6 +1672,12 @@ wpa_priv: $(BCHECK) $(OBJS_priv) $(OBJS_c) $(OBJS_t) $(OBJS_t2) $(OBJS) $(BCHECK) $(EXTRA_progs): .config @@ -117,7 +117,7 @@ wpa_supplicant: $(BCHECK) $(OBJS) $(EXTRA_progs) $(Q)$(LDO) $(LDFLAGS) -o wpa_supplicant $(OBJS) $(LIBS) $(EXTRALIBS) @$(E) " LD " $@ -@@ -1694,6 +1715,12 @@ endif +@@ -1757,6 +1778,12 @@ endif $(Q)sed -e 's|\@BINDIR\@|$(BINDIR)|g' $< >$@ @$(E) " sed" $< @@ -132,7 +132,7 @@ wpa_cli.exe: wpa_cli --- a/src/drivers/driver.h +++ b/src/drivers/driver.h -@@ -4581,8 +4581,8 @@ union wpa_event_data { +@@ -4707,8 +4707,8 @@ union wpa_event_data { * Driver wrapper code should call this function whenever an event is received * from the driver. */ @@ -145,7 +145,7 @@ /* --- a/src/ap/drv_callbacks.c +++ b/src/ap/drv_callbacks.c -@@ -1075,8 +1075,8 @@ static void hostapd_event_dfs_cac_starte +@@ -1122,8 +1122,8 @@ static void hostapd_event_dfs_cac_starte #endif /* NEED_AP_MLME */ @@ -158,7 +158,7 @@ #ifndef CONFIG_NO_STDOUT_DEBUG --- a/wpa_supplicant/wpa_priv.c +++ b/wpa_supplicant/wpa_priv.c -@@ -819,8 +819,8 @@ static void wpa_priv_send_ft_response(st +@@ -932,8 +932,8 @@ static void wpa_priv_send_ft_response(st } @@ -169,7 +169,7 @@ { struct wpa_priv_interface *iface = ctx; -@@ -961,6 +961,7 @@ int main(int argc, char *argv[]) +@@ -1082,6 +1082,7 @@ int main(int argc, char *argv[]) if (os_program_init()) return -1; @@ -179,7 +179,7 @@ for (;;) { --- a/wpa_supplicant/events.c +++ b/wpa_supplicant/events.c -@@ -3138,8 +3138,8 @@ static void wpa_supplicant_event_assoc_a +@@ -3298,8 +3298,8 @@ static void wpa_supplicant_event_assoc_a } @@ -189,10 +189,19 @@ + union wpa_event_data *data) { struct wpa_supplicant *wpa_s = ctx; - + int resched; +@@ -3947,7 +3947,7 @@ void wpa_supplicant_event(void *ctx, enu + #endif /* CONFIG_AP */ + break; + case EVENT_ACS_CHANNEL_SELECTED: +-#ifdef CONFIG_ACS ++#if defined(CONFIG_ACS) && defined(CONFIG_AP) + if (!wpa_s->ap_iface) + break; + hostapd_acs_channel_selected(wpa_s->ap_iface->bss[0], --- a/wpa_supplicant/wpa_supplicant.c +++ b/wpa_supplicant/wpa_supplicant.c -@@ -4300,6 +4300,9 @@ static void wpa_supplicant_deinit_iface( +@@ -4845,6 +4845,9 @@ static void wpa_supplicant_deinit_iface( os_free(wpa_s); } @@ -202,7 +211,7 @@ /** * wpa_supplicant_add_iface - Add a new network interface -@@ -4526,6 +4529,7 @@ struct wpa_global * wpa_supplicant_init( +@@ -5100,6 +5103,7 @@ 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 */ @@ -212,7 +221,7 @@ wpa_debug_open_file(params->wpa_debug_file_path); --- a/hostapd/main.c +++ b/hostapd/main.c -@@ -511,6 +511,9 @@ static int hostapd_get_ctrl_iface_group( +@@ -513,6 +513,9 @@ static int hostapd_get_ctrl_iface_group( return 0; } @@ -222,13 +231,13 @@ #ifdef CONFIG_WPS static int gen_uuid(const char *txt_addr) -@@ -562,6 +565,7 @@ int main(int argc, char *argv[]) - interfaces.global_iface_name = NULL; +@@ -588,6 +591,7 @@ int main(int argc, char *argv[]) interfaces.global_ctrl_sock = -1; + interfaces.global_ctrl_dst = NULL; + wpa_supplicant_event = hostapd_wpa_event; for (;;) { - c = getopt(argc, argv, "b:Bde:f:hKP:Ttu:vg:G:"); + c = getopt(argc, argv, "b:Bde:f:hKP:STtu:vg:G:"); if (c < 0) --- a/src/drivers/drivers.c +++ b/src/drivers/drivers.c @@ -244,20 +253,18 @@ #endif /* CONFIG_DRIVER_WEXT */ --- a/wpa_supplicant/eapol_test.c +++ b/wpa_supplicant/eapol_test.c -@@ -28,8 +28,12 @@ +@@ -29,7 +29,10 @@ #include "ctrl_iface.h" #include "pcsc_funcs.h" #include "wpas_glue.h" +#include "drivers/driver.h" - +void (*wpa_supplicant_event)(void *ctx, enum wpa_event_type event, + union wpa_event_data *data); -+ - struct wpa_driver_ops *wpa_drivers[] = { NULL }; + const struct wpa_driver_ops *const wpa_drivers[] = { NULL }; -@@ -1203,6 +1207,8 @@ static void usage(void) +@@ -1288,6 +1291,8 @@ static void usage(void) "option several times.\n"); } @@ -266,7 +273,7 @@ int main(int argc, char *argv[]) { -@@ -1221,6 +1227,7 @@ int main(int argc, char *argv[]) +@@ -1308,6 +1313,7 @@ int main(int argc, char *argv[]) if (os_program_init()) return -1; |