diff options
author | Felix Fietkau <nbd@openwrt.org> | 2014-06-05 15:58:01 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2014-06-05 15:58:01 +0000 |
commit | 5758b210e3ae37fe949a528281746cdab33b3138 (patch) | |
tree | 56a61d3a8976bc10a8af73ae3d8e8e26485744ab /package/network/services/hostapd/patches/200-multicall.patch | |
parent | 22fcfab3533ca3f974c768efffd3524a9698b49f (diff) | |
download | master-31e0f0ae-5758b210e3ae37fe949a528281746cdab33b3138.tar.gz master-31e0f0ae-5758b210e3ae37fe949a528281746cdab33b3138.tar.bz2 master-31e0f0ae-5758b210e3ae37fe949a528281746cdab33b3138.zip |
hostapd: update to 2014-06-03
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 41022
Diffstat (limited to 'package/network/services/hostapd/patches/200-multicall.patch')
-rw-r--r-- | package/network/services/hostapd/patches/200-multicall.patch | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/package/network/services/hostapd/patches/200-multicall.patch b/package/network/services/hostapd/patches/200-multicall.patch index b485895879..e8bbe450f9 100644 --- a/package/network/services/hostapd/patches/200-multicall.patch +++ b/package/network/services/hostapd/patches/200-multicall.patch @@ -62,7 +62,7 @@ ifdef CONFIG_TESTING_OPTIONS CFLAGS += -DCONFIG_TESTING_OPTIONS -@@ -746,6 +747,10 @@ ifdef CONFIG_DYNAMIC_EAP_METHODS +@@ -741,6 +742,10 @@ ifdef CONFIG_DYNAMIC_EAP_METHODS CFLAGS += -DCONFIG_DYNAMIC_EAP_METHODS LIBS += -ldl -rdynamic endif @@ -72,8 +72,8 @@ + endif endif - ifdef CONFIG_AP -@@ -754,9 +759,11 @@ NEED_EAP_COMMON=y + ifdef CONFIG_MACSEC +@@ -762,9 +767,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 -@@ -818,10 +825,18 @@ endif +@@ -826,10 +833,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 -@@ -1584,6 +1599,12 @@ wpa_priv: $(BCHECK) $(OBJS_priv) +@@ -1602,6 +1617,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 " $@ -@@ -1664,6 +1685,12 @@ endif +@@ -1682,6 +1703,12 @@ endif %@.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 -@@ -3886,8 +3886,8 @@ union wpa_event_data { +@@ -4117,8 +4117,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 -@@ -906,8 +906,8 @@ static void hostapd_event_dfs_nop_finish +@@ -926,8 +926,8 @@ static void hostapd_event_dfs_nop_finish #endif /* NEED_AP_MLME */ @@ -179,7 +179,7 @@ for (;;) { --- a/wpa_supplicant/events.c +++ b/wpa_supplicant/events.c -@@ -2929,8 +2929,8 @@ static void wpa_supplicant_notify_avoid_ +@@ -2919,8 +2919,8 @@ static void wpa_supplicant_notify_avoid_ } @@ -192,7 +192,7 @@ --- a/wpa_supplicant/wpa_supplicant.c +++ b/wpa_supplicant/wpa_supplicant.c -@@ -3724,6 +3724,9 @@ static void wpa_supplicant_deinit_iface( +@@ -3810,6 +3810,9 @@ static void wpa_supplicant_deinit_iface( os_free(wpa_s); } @@ -202,7 +202,7 @@ /** * wpa_supplicant_add_iface - Add a new network interface -@@ -3915,6 +3918,7 @@ struct wpa_global * wpa_supplicant_init( +@@ -4001,6 +4004,7 @@ struct wpa_global * wpa_supplicant_init( wpa_msg_register_ifname_cb(wpa_supplicant_msg_ifname_cb); #endif /* CONFIG_NO_WPA_MSG */ @@ -257,7 +257,7 @@ struct wpa_driver_ops *wpa_drivers[] = { NULL }; -@@ -1140,6 +1144,8 @@ static void usage(void) +@@ -1185,6 +1189,8 @@ static void usage(void) "option several times.\n"); } @@ -266,7 +266,7 @@ int main(int argc, char *argv[]) { -@@ -1158,6 +1164,7 @@ int main(int argc, char *argv[]) +@@ -1203,6 +1209,7 @@ int main(int argc, char *argv[]) if (os_program_init()) return -1; |