diff options
author | Felix Fietkau <nbd@openwrt.org> | 2012-09-13 12:38:51 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2012-09-13 12:38:51 +0000 |
commit | 36ac145eea94170cc2fa924bea8cd61487a0d253 (patch) | |
tree | 9bb15ad13013f4013dbcb56b2e17a04ab3eb6c77 /package/hostapd/patches/410-multicall.patch | |
parent | 6f223b33c2a9b89b24eff8532f3dc3a2349fefac (diff) | |
download | master-187ad058-36ac145eea94170cc2fa924bea8cd61487a0d253.tar.gz master-187ad058-36ac145eea94170cc2fa924bea8cd61487a0d253.tar.bz2 master-187ad058-36ac145eea94170cc2fa924bea8cd61487a0d253.zip |
hostapd: update to 2012-09-10
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33392 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/hostapd/patches/410-multicall.patch')
-rw-r--r-- | package/hostapd/patches/410-multicall.patch | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/package/hostapd/patches/410-multicall.patch b/package/hostapd/patches/410-multicall.patch index b653769329..7900428aea 100644 --- a/package/hostapd/patches/410-multicall.patch +++ b/package/hostapd/patches/410-multicall.patch @@ -8,8 +8,8 @@ ifndef CONFIG_OS ifdef CONFIG_NATIVE_WINDOWS -@@ -168,10 +169,14 @@ ifdef CONFIG_IEEE80211N - CFLAGS += -DCONFIG_IEEE80211N +@@ -188,10 +189,14 @@ ifdef CONFIG_IEEE80211AC + CFLAGS += -DCONFIG_IEEE80211AC endif +ifndef MULTICALL @@ -26,7 +26,7 @@ LIBS += $(DRV_AP_LIBS) ifdef CONFIG_L2_PACKET -@@ -815,6 +820,12 @@ install: all +@@ -867,6 +872,12 @@ install: all BCHECK=../src/drivers/build.hostapd @@ -39,7 +39,7 @@ hostapd: $(BCHECK) $(OBJS) $(Q)$(CC) $(LDFLAGS) -o hostapd $(OBJS) $(LIBS) @$(E) " LD " $@ -@@ -853,6 +864,12 @@ HOBJS += ../src/crypto/aes-internal.o +@@ -905,6 +916,12 @@ HOBJS += ../src/crypto/aes-internal.o HOBJS += ../src/crypto/aes-internal-enc.o endif @@ -62,7 +62,7 @@ BINALL=wpa_supplicant wpa_cli -@@ -673,6 +674,10 @@ ifdef CONFIG_DYNAMIC_EAP_METHODS +@@ -705,6 +706,10 @@ ifdef CONFIG_DYNAMIC_EAP_METHODS CFLAGS += -DCONFIG_DYNAMIC_EAP_METHODS LIBS += -ldl -rdynamic endif @@ -73,7 +73,7 @@ endif ifdef CONFIG_AP -@@ -681,9 +686,11 @@ NEED_EAP_COMMON=y +@@ -713,9 +718,11 @@ NEED_EAP_COMMON=y NEED_RSN_AUTHENTICATOR=y CFLAGS += -DCONFIG_AP OBJS += ap.o @@ -85,9 +85,9 @@ OBJS += ../src/ap/hostapd.o OBJS += ../src/ap/wpa_auth_glue.o OBJS += ../src/ap/utils.o -@@ -731,10 +738,18 @@ endif - ifdef CONFIG_INTERWORKING - OBJS += ../src/ap/gas_serv.o +@@ -770,10 +777,18 @@ endif + ifdef CONFIG_HS20 + OBJS += ../src/ap/hs20.o endif +else + ifdef MULTICALL @@ -104,7 +104,7 @@ NEED_AES_WRAP=y OBJS += ../src/ap/wpa_auth.o OBJS += ../src/ap/wpa_auth_ie.o -@@ -1419,6 +1434,12 @@ wpa_priv: $(BCHECK) $(OBJS_priv) +@@ -1515,6 +1530,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 " $@ -@@ -1485,6 +1506,12 @@ eap_ikev2.so: ../src/eap_peer/eap_ikev2. +@@ -1585,6 +1606,12 @@ eap_ikev2.so: ../src/eap_peer/eap_ikev2. %@.service: %.service.arg.in sed -e 's|\@BINDIR\@|$(BINDIR)|g' $< >$@ @@ -132,7 +132,7 @@ wpa_cli.exe: wpa_cli --- a/src/drivers/driver.h +++ b/src/drivers/driver.h -@@ -3572,8 +3572,8 @@ union wpa_event_data { +@@ -3686,8 +3686,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 -@@ -467,8 +467,8 @@ static void hostapd_event_eapol_rx(struc +@@ -685,8 +685,8 @@ static void hostapd_event_eapol_rx(struc } @@ -179,7 +179,7 @@ for (;;) { --- a/wpa_supplicant/events.c +++ b/wpa_supplicant/events.c -@@ -2046,8 +2046,8 @@ static void wnm_action_rx(struct wpa_sup +@@ -2258,8 +2258,8 @@ static void wnm_action_rx(struct wpa_sup } @@ -192,7 +192,7 @@ u16 reason_code = 0; --- a/wpa_supplicant/wpa_supplicant.c +++ b/wpa_supplicant/wpa_supplicant.c -@@ -2704,6 +2704,9 @@ static void wpa_supplicant_deinit_iface( +@@ -2921,6 +2921,9 @@ static void wpa_supplicant_deinit_iface( } } @@ -202,7 +202,7 @@ /** * wpa_supplicant_add_iface - Add a new network interface -@@ -2895,6 +2898,7 @@ struct wpa_global * wpa_supplicant_init( +@@ -3113,6 +3116,7 @@ struct wpa_global * wpa_supplicant_init( wpa_msg_register_ifname_cb(wpa_supplicant_msg_ifname_cb); #endif /* CONFIG_NO_WPA_MSG */ @@ -212,8 +212,8 @@ wpa_debug_open_syslog(); --- a/hostapd/main.c +++ b/hostapd/main.c -@@ -533,6 +533,9 @@ static const char * hostapd_msg_ifname_c - return NULL; +@@ -530,6 +530,9 @@ static int hostapd_get_global_ctrl_iface + return 0; } +void hostapd_wpa_event(void *ctx, enum wpa_event_type event, @@ -222,13 +222,13 @@ int main(int argc, char *argv[]) { -@@ -546,6 +549,7 @@ int main(int argc, char *argv[]) - if (os_program_init()) - return -1; +@@ -555,6 +558,7 @@ int main(int argc, char *argv[]) + interfaces.global_iface_name = NULL; + interfaces.global_ctrl_sock = -1; + wpa_supplicant_event = hostapd_wpa_event; for (;;) { - c = getopt(argc, argv, "Bde:f:hKP:tv"); + c = getopt(argc, argv, "Bde:f:hKP:tvg:"); if (c < 0) --- a/src/drivers/drivers.c +++ b/src/drivers/drivers.c |