aboutsummaryrefslogtreecommitdiffstats
path: root/package/network/services/hostapd/patches/200-multicall.patch
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2016-12-14 10:04:44 +0100
committerFelix Fietkau <nbd@nbd.name>2016-12-20 16:24:21 +0100
commitf628d0e0e9adc5cf86a7d611e0d7c63cf6818188 (patch)
tree804063cf5c3eac7f9b1f7dd1db8282dbef17076f /package/network/services/hostapd/patches/200-multicall.patch
parent1a4d07c2c534588cd7c8fb8bd479eb952c213dba (diff)
downloadupstream-f628d0e0e9adc5cf86a7d611e0d7c63cf6818188.tar.gz
upstream-f628d0e0e9adc5cf86a7d611e0d7c63cf6818188.tar.bz2
upstream-f628d0e0e9adc5cf86a7d611e0d7c63cf6818188.zip
hostapd: update to version 2016-12-15
Update to latest upstream HEAD: - Refreshed all - Delete patches and parts which made it upstream Compile tested Full & Mini configs Run-tested Mini config Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com> Signed-off-by: Felix Fietkau <nbd@nbd.name> [another update, remove broken patch]
Diffstat (limited to 'package/network/services/hostapd/patches/200-multicall.patch')
-rw-r--r--package/network/services/hostapd/patches/200-multicall.patch50
1 files changed, 27 insertions, 23 deletions
diff --git a/package/network/services/hostapd/patches/200-multicall.patch b/package/network/services/hostapd/patches/200-multicall.patch
index aba9dafc5f..9ea3ef9c2d 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
-@@ -193,7 +194,8 @@ endif
+@@ -198,7 +199,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
-@@ -318,10 +320,14 @@ CFLAGS += -DCONFIG_MBO
+@@ -330,10 +332,14 @@ CFLAGS += -DCONFIG_MBO
OBJS += ../src/ap/mbo_ap.o
endif
@@ -36,7 +36,7 @@
LIBS += $(DRV_AP_LIBS)
ifdef CONFIG_L2_PACKET
-@@ -1054,6 +1060,12 @@ install: $(addprefix $(DESTDIR)$(BINDIR)
+@@ -1073,6 +1079,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 " $@
-@@ -1095,6 +1107,12 @@ HOBJS += ../src/crypto/aes-internal.o
+@@ -1114,6 +1126,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
-@@ -313,7 +314,9 @@ endif
+@@ -329,7 +330,9 @@ endif
ifdef CONFIG_IBSS_RSN
NEED_RSN_AUTHENTICATOR=y
CFLAGS += -DCONFIG_IBSS_RSN
@@ -82,7 +82,7 @@
OBJS += ibss_rsn.o
endif
-@@ -804,6 +807,10 @@ ifdef CONFIG_DYNAMIC_EAP_METHODS
+@@ -820,6 +823,10 @@ ifdef CONFIG_DYNAMIC_EAP_METHODS
CFLAGS += -DCONFIG_DYNAMIC_EAP_METHODS
LIBS += -ldl -rdynamic
endif
@@ -93,7 +93,7 @@
endif
ifdef CONFIG_MACSEC
-@@ -824,9 +831,11 @@ NEED_EAP_COMMON=y
+@@ -840,9 +847,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
-@@ -899,10 +908,18 @@ endif
+@@ -910,6 +919,12 @@ endif
ifdef CONFIG_HS20
OBJS += ../src/ap/hs20.o
endif
@@ -117,6 +117,10 @@
+ endif
endif
+ ifdef CONFIG_MBO
+@@ -918,7 +933,9 @@ CFLAGS += -DCONFIG_MBO
+ endif
+
ifdef NEED_RSN_AUTHENTICATOR
+ifndef MULTICALL
CFLAGS += -DCONFIG_NO_RADIUS
@@ -124,7 +128,7 @@
NEED_AES_WRAP=y
OBJS += ../src/ap/wpa_auth.o
OBJS += ../src/ap/wpa_auth_ie.o
-@@ -1685,6 +1702,12 @@ wpa_priv: $(BCHECK) $(OBJS_priv)
+@@ -1706,6 +1723,12 @@ wpa_priv: $(BCHECK) $(OBJS_priv)
$(OBJS_c) $(OBJS_t) $(OBJS_t2) $(OBJS) $(BCHECK) $(EXTRA_progs): .config
@@ -137,7 +141,7 @@
wpa_supplicant: $(BCHECK) $(OBJS) $(EXTRA_progs)
$(Q)$(LDO) $(LDFLAGS) -o wpa_supplicant $(OBJS) $(LIBS) $(EXTRALIBS)
@$(E) " LD " $@
-@@ -1787,6 +1810,12 @@ endif
+@@ -1808,6 +1831,12 @@ endif
-e 's|\@DBUS_INTERFACE\@|$(DBUS_INTERFACE)|g' $< >$@
@$(E) " sed" $<
@@ -152,7 +156,7 @@
wpa_cli.exe: wpa_cli
--- a/src/drivers/driver.h
+++ b/src/drivers/driver.h
-@@ -4870,8 +4870,8 @@ union wpa_event_data {
+@@ -4968,8 +4968,8 @@ union wpa_event_data {
* Driver wrapper code should call this function whenever an event is received
* from the driver.
*/
@@ -163,7 +167,7 @@
/**
* wpa_supplicant_event_global - Report a driver event for wpa_supplicant
-@@ -4883,7 +4883,7 @@ void wpa_supplicant_event(void *ctx, enu
+@@ -4981,7 +4981,7 @@ void wpa_supplicant_event(void *ctx, enu
* Same as wpa_supplicant_event(), but we search for the interface in
* wpa_global.
*/
@@ -174,7 +178,7 @@
/*
--- a/src/ap/drv_callbacks.c
+++ b/src/ap/drv_callbacks.c
-@@ -1164,8 +1164,8 @@ static void hostapd_event_dfs_cac_starte
+@@ -1163,8 +1163,8 @@ static void hostapd_event_dfs_cac_starte
#endif /* NEED_AP_MLME */
@@ -185,7 +189,7 @@
{
struct hostapd_data *hapd = ctx;
#ifndef CONFIG_NO_STDOUT_DEBUG
-@@ -1374,7 +1374,7 @@ void wpa_supplicant_event(void *ctx, enu
+@@ -1373,7 +1373,7 @@ void wpa_supplicant_event(void *ctx, enu
}
@@ -196,7 +200,7 @@
struct hapd_interfaces *interfaces = ctx;
--- a/wpa_supplicant/wpa_priv.c
+++ b/wpa_supplicant/wpa_priv.c
-@@ -940,8 +940,8 @@ static void wpa_priv_send_ft_response(st
+@@ -1031,8 +1031,8 @@ static void wpa_priv_send_ft_response(st
}
@@ -207,7 +211,7 @@
{
struct wpa_priv_interface *iface = ctx;
-@@ -1010,7 +1010,7 @@ void wpa_supplicant_event(void *ctx, enu
+@@ -1101,7 +1101,7 @@ void wpa_supplicant_event(void *ctx, enu
}
@@ -216,7 +220,7 @@
union wpa_event_data *data)
{
struct wpa_priv_global *global = ctx;
-@@ -1122,6 +1122,8 @@ int main(int argc, char *argv[])
+@@ -1213,6 +1213,8 @@ int main(int argc, char *argv[])
if (os_program_init())
return -1;
@@ -227,7 +231,7 @@
os_memset(&global, 0, sizeof(global));
--- a/wpa_supplicant/events.c
+++ b/wpa_supplicant/events.c
-@@ -3398,8 +3398,8 @@ static void wpa_supplicant_event_assoc_a
+@@ -3610,8 +3610,8 @@ static void wpa_supplicant_event_assoc_a
}
@@ -238,7 +242,7 @@
{
struct wpa_supplicant *wpa_s = ctx;
int resched;
-@@ -4074,7 +4074,7 @@ void wpa_supplicant_event(void *ctx, enu
+@@ -4315,7 +4315,7 @@ void wpa_supplicant_event(void *ctx, enu
#endif /* CONFIG_AP */
break;
case EVENT_ACS_CHANNEL_SELECTED:
@@ -247,7 +251,7 @@
if (!wpa_s->ap_iface)
break;
hostapd_acs_channel_selected(wpa_s->ap_iface->bss[0],
-@@ -4096,7 +4096,7 @@ void wpa_supplicant_event(void *ctx, enu
+@@ -4337,7 +4337,7 @@ void wpa_supplicant_event(void *ctx, enu
}
@@ -258,7 +262,7 @@
struct wpa_supplicant *wpa_s;
--- a/wpa_supplicant/wpa_supplicant.c
+++ b/wpa_supplicant/wpa_supplicant.c
-@@ -5094,7 +5094,6 @@ struct wpa_interface * wpa_supplicant_ma
+@@ -5136,7 +5136,6 @@ struct wpa_interface * wpa_supplicant_ma
return NULL;
}
@@ -266,7 +270,7 @@
/**
* wpa_supplicant_match_existing - Match existing interfaces
* @global: Pointer to global data from wpa_supplicant_init()
-@@ -5131,6 +5130,11 @@ static int wpa_supplicant_match_existing
+@@ -5173,6 +5172,11 @@ static int wpa_supplicant_match_existing
#endif /* CONFIG_MATCH_IFACE */
@@ -278,7 +282,7 @@
/**
* wpa_supplicant_add_iface - Add a new network interface
-@@ -5386,6 +5390,8 @@ struct wpa_global * wpa_supplicant_init(
+@@ -5428,6 +5432,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 */