diff options
Diffstat (limited to 'package/network/services/hostapd/patches/200-multicall.patch')
| -rw-r--r-- | package/network/services/hostapd/patches/200-multicall.patch | 49 |
1 files changed, 24 insertions, 25 deletions
diff --git a/package/network/services/hostapd/patches/200-multicall.patch b/package/network/services/hostapd/patches/200-multicall.patch index 40bd7336ec..aba9dafc5f 100644 --- a/package/network/services/hostapd/patches/200-multicall.patch +++ b/package/network/services/hostapd/patches/200-multicall.patch @@ -8,7 +8,7 @@ ifndef CONFIG_NO_GITVER # Add VERSION_STR postfix for builds from a git repository -@@ -190,7 +191,8 @@ endif +@@ -193,7 +194,8 @@ endif ifdef CONFIG_NO_VLAN CFLAGS += -DCONFIG_NO_VLAN @@ -18,7 +18,7 @@ OBJS += ../src/ap/vlan_init.o OBJS += ../src/ap/vlan_ifconfig.o OBJS += ../src/ap/vlan.o -@@ -315,10 +317,14 @@ CFLAGS += -DCONFIG_MBO +@@ -318,10 +320,14 @@ CFLAGS += -DCONFIG_MBO OBJS += ../src/ap/mbo_ap.o endif @@ -36,7 +36,7 @@ LIBS += $(DRV_AP_LIBS) ifdef CONFIG_L2_PACKET -@@ -1051,6 +1057,12 @@ install: $(addprefix $(DESTDIR)$(BINDIR) +@@ -1054,6 +1060,12 @@ install: $(addprefix $(DESTDIR)$(BINDIR) BCHECK=../src/drivers/build.hostapd @@ -49,7 +49,7 @@ hostapd: $(BCHECK) $(OBJS) $(Q)$(CC) $(LDFLAGS) -o hostapd $(OBJS) $(LIBS) @$(E) " LD " $@ -@@ -1092,6 +1104,12 @@ HOBJS += ../src/crypto/aes-internal.o +@@ -1095,6 +1107,12 @@ HOBJS += ../src/crypto/aes-internal.o HOBJS += ../src/crypto/aes-internal-enc.o endif @@ -72,7 +72,7 @@ ifndef CONFIG_NO_GITVER # Add VERSION_STR postfix for builds from a git repository -@@ -312,7 +313,9 @@ endif +@@ -313,7 +314,9 @@ endif ifdef CONFIG_IBSS_RSN NEED_RSN_AUTHENTICATOR=y CFLAGS += -DCONFIG_IBSS_RSN @@ -82,7 +82,7 @@ OBJS += ibss_rsn.o endif -@@ -803,6 +806,10 @@ ifdef CONFIG_DYNAMIC_EAP_METHODS +@@ -804,6 +807,10 @@ ifdef CONFIG_DYNAMIC_EAP_METHODS CFLAGS += -DCONFIG_DYNAMIC_EAP_METHODS LIBS += -ldl -rdynamic endif @@ -93,7 +93,7 @@ endif ifdef CONFIG_MACSEC -@@ -823,9 +830,11 @@ NEED_EAP_COMMON=y +@@ -824,9 +831,11 @@ NEED_EAP_COMMON=y NEED_RSN_AUTHENTICATOR=y CFLAGS += -DCONFIG_AP OBJS += ap.o @@ -105,7 +105,7 @@ OBJS += ../src/ap/hostapd.o OBJS += ../src/ap/wpa_auth_glue.o OBJS += ../src/ap/utils.o -@@ -898,10 +907,18 @@ endif +@@ -899,10 +908,18 @@ endif ifdef CONFIG_HS20 OBJS += ../src/ap/hs20.o endif @@ -124,7 +124,7 @@ NEED_AES_WRAP=y OBJS += ../src/ap/wpa_auth.o OBJS += ../src/ap/wpa_auth_ie.o -@@ -1680,6 +1697,12 @@ wpa_priv: $(BCHECK) $(OBJS_priv) +@@ -1685,6 +1702,12 @@ wpa_priv: $(BCHECK) $(OBJS_priv) $(OBJS_c) $(OBJS_t) $(OBJS_t2) $(OBJS) $(BCHECK) $(EXTRA_progs): .config @@ -137,7 +137,7 @@ wpa_supplicant: $(BCHECK) $(OBJS) $(EXTRA_progs) $(Q)$(LDO) $(LDFLAGS) -o wpa_supplicant $(OBJS) $(LIBS) $(EXTRALIBS) @$(E) " LD " $@ -@@ -1782,6 +1805,12 @@ endif +@@ -1787,6 +1810,12 @@ endif -e 's|\@DBUS_INTERFACE\@|$(DBUS_INTERFACE)|g' $< >$@ @$(E) " sed" $< @@ -152,7 +152,7 @@ wpa_cli.exe: wpa_cli --- a/src/drivers/driver.h +++ b/src/drivers/driver.h -@@ -4794,8 +4794,8 @@ union wpa_event_data { +@@ -4870,8 +4870,8 @@ union wpa_event_data { * Driver wrapper code should call this function whenever an event is received * from the driver. */ @@ -163,7 +163,7 @@ /** * wpa_supplicant_event_global - Report a driver event for wpa_supplicant -@@ -4807,7 +4807,7 @@ void wpa_supplicant_event(void *ctx, enu +@@ -4883,7 +4883,7 @@ void wpa_supplicant_event(void *ctx, enu * Same as wpa_supplicant_event(), but we search for the interface in * wpa_global. */ @@ -174,7 +174,7 @@ /* --- a/src/ap/drv_callbacks.c +++ b/src/ap/drv_callbacks.c -@@ -1157,8 +1157,8 @@ static void hostapd_event_dfs_cac_starte +@@ -1164,8 +1164,8 @@ static void hostapd_event_dfs_cac_starte #endif /* NEED_AP_MLME */ @@ -185,7 +185,7 @@ { struct hostapd_data *hapd = ctx; #ifndef CONFIG_NO_STDOUT_DEBUG -@@ -1367,7 +1367,7 @@ void wpa_supplicant_event(void *ctx, enu +@@ -1374,7 +1374,7 @@ void wpa_supplicant_event(void *ctx, enu } @@ -227,7 +227,7 @@ os_memset(&global, 0, sizeof(global)); --- a/wpa_supplicant/events.c +++ b/wpa_supplicant/events.c -@@ -3384,8 +3384,8 @@ static void wpa_supplicant_event_assoc_a +@@ -3398,8 +3398,8 @@ static void wpa_supplicant_event_assoc_a } @@ -238,7 +238,7 @@ { struct wpa_supplicant *wpa_s = ctx; int resched; -@@ -4051,7 +4051,7 @@ void wpa_supplicant_event(void *ctx, enu +@@ -4074,7 +4074,7 @@ void wpa_supplicant_event(void *ctx, enu #endif /* CONFIG_AP */ break; case EVENT_ACS_CHANNEL_SELECTED: @@ -247,7 +247,7 @@ if (!wpa_s->ap_iface) break; hostapd_acs_channel_selected(wpa_s->ap_iface->bss[0], -@@ -4065,7 +4065,7 @@ void wpa_supplicant_event(void *ctx, enu +@@ -4096,7 +4096,7 @@ void wpa_supplicant_event(void *ctx, enu } @@ -258,7 +258,7 @@ struct wpa_supplicant *wpa_s; --- a/wpa_supplicant/wpa_supplicant.c +++ b/wpa_supplicant/wpa_supplicant.c -@@ -4990,7 +4990,6 @@ struct wpa_interface * wpa_supplicant_ma +@@ -5094,7 +5094,6 @@ struct wpa_interface * wpa_supplicant_ma return NULL; } @@ -266,7 +266,7 @@ /** * wpa_supplicant_match_existing - Match existing interfaces * @global: Pointer to global data from wpa_supplicant_init() -@@ -5027,6 +5026,11 @@ static int wpa_supplicant_match_existing +@@ -5131,6 +5130,11 @@ static int wpa_supplicant_match_existing #endif /* CONFIG_MATCH_IFACE */ @@ -278,7 +278,7 @@ /** * wpa_supplicant_add_iface - Add a new network interface -@@ -5282,6 +5286,8 @@ struct wpa_global * wpa_supplicant_init( +@@ -5386,6 +5390,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 */ @@ -312,7 +312,7 @@ if (c < 0) --- a/src/drivers/drivers.c +++ b/src/drivers/drivers.c -@@ -10,6 +10,11 @@ +@@ -10,6 +10,10 @@ #include "utils/common.h" #include "driver.h" @@ -320,10 +320,9 @@ + union wpa_event_data *data); +void (*wpa_supplicant_event_global)(void *ctx, enum wpa_event_type event, + union wpa_event_data *data); -+ - #ifdef CONFIG_DRIVER_WEXT - extern struct wpa_driver_ops wpa_driver_wext_ops; /* driver_wext.c */ - #endif /* CONFIG_DRIVER_WEXT */ + + const struct wpa_driver_ops *const wpa_drivers[] = + { --- a/wpa_supplicant/eapol_test.c +++ b/wpa_supplicant/eapol_test.c @@ -29,7 +29,12 @@ |