projects
/
openwrt
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
hostapd: update mesh DFS patches and add mesh HE support
[openwrt/openwrt.git]
/
package
/
network
/
services
/
hostapd
/
patches
/
200-multicall.patch
diff --git
a/package/network/services/hostapd/patches/200-multicall.patch
b/package/network/services/hostapd/patches/200-multicall.patch
index 78f9ae9d5c25c1630cdde8fa576fabdc35f27c83..9119a24c552f4edfac3cd19e236ad287a0d9fe51 100644
(file)
--- a/
package/network/services/hostapd/patches/200-multicall.patch
+++ b/
package/network/services/hostapd/patches/200-multicall.patch
@@
-1,6
+1,6
@@
--- a/hostapd/Makefile
+++ b/hostapd/Makefile
--- a/hostapd/Makefile
+++ b/hostapd/Makefile
-@@ -
28,6 +28
,7 @@ CFLAGS += -I$(abspath ../src/utils)
+@@ -
31,6 +31
,7 @@ CFLAGS += -I$(abspath ../src/utils)
export BINDIR ?= /usr/local/bin/
-include .config
export BINDIR ?= /usr/local/bin/
-include .config
@@
-8,7
+8,7
@@
ifndef CONFIG_NO_GITVER
# Add VERSION_STR postfix for builds from a git repository
ifndef CONFIG_NO_GITVER
# Add VERSION_STR postfix for builds from a git repository
-@@ -
198,7 +199
,8 @@ endif
+@@ -
204,7 +205
,8 @@ endif
ifdef CONFIG_NO_VLAN
CFLAGS += -DCONFIG_NO_VLAN
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
OBJS += ../src/ap/vlan_init.o
OBJS += ../src/ap/vlan_ifconfig.o
OBJS += ../src/ap/vlan.o
-@@ -3
60,10 +362
,14 @@ CFLAGS += -DCONFIG_MBO
+@@ -3
54,10 +356
,14 @@ CFLAGS += -DCONFIG_MBO
OBJS += ../src/ap/mbo_ap.o
endif
OBJS += ../src/ap/mbo_ap.o
endif
@@
-36,7
+36,7
@@
LIBS += $(DRV_AP_LIBS)
ifdef CONFIG_L2_PACKET
LIBS += $(DRV_AP_LIBS)
ifdef CONFIG_L2_PACKET
-@@ -1
286,6 +1292
,12 @@ install: $(addprefix $(DESTDIR)$(BINDIR)
+@@ -1
311,6 +1317
,12 @@ install: $(addprefix $(DESTDIR)$(BINDIR)
BCHECK=../src/drivers/build.hostapd
BCHECK=../src/drivers/build.hostapd
@@
-49,9
+49,9
@@
hostapd: $(BCHECK) $(OBJS)
$(Q)$(CC) $(LDFLAGS) -o hostapd $(OBJS) $(LIBS)
@$(E) " LD " $@
hostapd: $(BCHECK) $(OBJS)
$(Q)$(CC) $(LDFLAGS) -o hostapd $(OBJS) $(LIBS)
@$(E) " LD " $@
-@@ -13
28,6 +1340,12 @@ ifeq ($(CONFIG_TLS), linux)
-
HOBJS += ../src/crypto/crypto_linux
.o
- endif
+@@ -13
74,6 +1386,12 @@ SOBJS += ../src/crypto/sha256-kdf.o
+
SOBJS += ../src/crypto/sha384-kdf
.o
+ SOBJS += ../src/crypto/sha512-kdf.o
+dump_cflags:
+ @printf "%s " "$(CFLAGS)"
+dump_cflags:
+ @printf "%s " "$(CFLAGS)"
@@
-72,7
+72,7
@@
ifndef CONFIG_NO_GITVER
# Add VERSION_STR postfix for builds from a git repository
ifndef CONFIG_NO_GITVER
# Add VERSION_STR postfix for builds from a git repository
-@@ -36
2,7 +363
,9 @@ endif
+@@ -36
9,7 +370
,9 @@ endif
ifdef CONFIG_IBSS_RSN
NEED_RSN_AUTHENTICATOR=y
CFLAGS += -DCONFIG_IBSS_RSN
ifdef CONFIG_IBSS_RSN
NEED_RSN_AUTHENTICATOR=y
CFLAGS += -DCONFIG_IBSS_RSN
@@
-82,7
+82,7
@@
OBJS += ibss_rsn.o
endif
OBJS += ibss_rsn.o
endif
-@@ -8
70,6 +87
3,10 @@ ifdef CONFIG_DYNAMIC_EAP_METHODS
+@@ -8
90,6 +89
3,10 @@ ifdef CONFIG_DYNAMIC_EAP_METHODS
CFLAGS += -DCONFIG_DYNAMIC_EAP_METHODS
LIBS += -ldl -rdynamic
endif
CFLAGS += -DCONFIG_DYNAMIC_EAP_METHODS
LIBS += -ldl -rdynamic
endif
@@
-93,7
+93,7
@@
endif
ifdef CONFIG_AP
endif
ifdef CONFIG_AP
-@@ -8
77,9 +88
4,11 @@ NEED_EAP_COMMON=y
+@@ -8
97,9 +90
4,11 @@ NEED_EAP_COMMON=y
NEED_RSN_AUTHENTICATOR=y
CFLAGS += -DCONFIG_AP
OBJS += ap.o
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
OBJS += ../src/ap/hostapd.o
OBJS += ../src/ap/wpa_auth_glue.o
OBJS += ../src/ap/utils.o
-@@ -9
61,6 +970
,12 @@ endif
+@@ -9
79,6 +988
,12 @@ endif
ifdef CONFIG_HS20
OBJS += ../src/ap/hs20.o
endif
ifdef CONFIG_HS20
OBJS += ../src/ap/hs20.o
endif
@@
-118,7
+118,7
@@
endif
ifdef CONFIG_MBO
endif
ifdef CONFIG_MBO
-@@ -9
69,7 +984
,9 @@ CFLAGS += -DCONFIG_MBO
+@@ -9
87,7 +1002
,9 @@ CFLAGS += -DCONFIG_MBO
endif
ifdef NEED_RSN_AUTHENTICATOR
endif
ifdef NEED_RSN_AUTHENTICATOR
@@
-128,7
+128,7
@@
NEED_AES_WRAP=y
OBJS += ../src/ap/wpa_auth.o
OBJS += ../src/ap/wpa_auth_ie.o
NEED_AES_WRAP=y
OBJS += ../src/ap/wpa_auth.o
OBJS += ../src/ap/wpa_auth_ie.o
-@@ -18
72,6 +1889
,12 @@ wpa_priv: $(BCHECK) $(OBJS_priv)
+@@ -18
97,6 +1914
,12 @@ wpa_priv: $(BCHECK) $(OBJS_priv)
$(OBJS_c) $(OBJS_t) $(OBJS_t2) $(OBJS) $(BCHECK) $(EXTRA_progs): .config
$(OBJS_c) $(OBJS_t) $(OBJS_t2) $(OBJS) $(BCHECK) $(EXTRA_progs): .config
@@
-141,7
+141,7
@@
wpa_supplicant: $(BCHECK) $(OBJS) $(EXTRA_progs)
$(Q)$(LDO) $(LDFLAGS) -o wpa_supplicant $(OBJS) $(LIBS) $(EXTRALIBS)
@$(E) " LD " $@
wpa_supplicant: $(BCHECK) $(OBJS) $(EXTRA_progs)
$(Q)$(LDO) $(LDFLAGS) -o wpa_supplicant $(OBJS) $(LIBS) $(EXTRALIBS)
@$(E) " LD " $@
-@@ -19
72,6 +1995
,12 @@ endif
+@@ -19
97,6 +2020
,12 @@ endif
$(Q)sed -e 's|\@BINDIR\@|$(BINDIR)|g' $< >$@
@$(E) " sed" $<
$(Q)sed -e 's|\@BINDIR\@|$(BINDIR)|g' $< >$@
@$(E) " sed" $<
@@
-156,7
+156,7
@@
wpa_cli.exe: wpa_cli
--- a/src/drivers/driver.h
+++ b/src/drivers/driver.h
wpa_cli.exe: wpa_cli
--- a/src/drivers/driver.h
+++ b/src/drivers/driver.h
-@@ -5
551,8 +5551
,8 @@ union wpa_event_data {
+@@ -5
886,8 +5886
,8 @@ union wpa_event_data {
* Driver wrapper code should call this function whenever an event is received
* from the driver.
*/
* Driver wrapper code should call this function whenever an event is received
* from the driver.
*/
@@
-167,7
+167,7
@@
/**
* wpa_supplicant_event_global - Report a driver event for wpa_supplicant
/**
* wpa_supplicant_event_global - Report a driver event for wpa_supplicant
-@@ -5
564,7 +5564
,7 @@ void wpa_supplicant_event(void *ctx, enu
+@@ -5
899,7 +5899
,7 @@ void wpa_supplicant_event(void *ctx, enu
* Same as wpa_supplicant_event(), but we search for the interface in
* wpa_global.
*/
* Same as wpa_supplicant_event(), but we search for the interface in
* wpa_global.
*/
@@
-178,8
+178,8
@@
/*
--- a/src/ap/drv_callbacks.c
+++ b/src/ap/drv_callbacks.c
/*
--- a/src/ap/drv_callbacks.c
+++ b/src/ap/drv_callbacks.c
-@@ -1
581,8 +1581,8 @@ static void hostapd_event_wds_sta_interf
- }
+@@ -1
789,8 +1789,8 @@ err:
+ #endif /* CONFIG_OWE */
-void wpa_supplicant_event(void *ctx, enum wpa_event_type event,
-void wpa_supplicant_event(void *ctx, enum wpa_event_type event,
@@
-189,7
+189,7
@@
{
struct hostapd_data *hapd = ctx;
#ifndef CONFIG_NO_STDOUT_DEBUG
{
struct hostapd_data *hapd = ctx;
#ifndef CONFIG_NO_STDOUT_DEBUG
-@@ -
1816,7 +1816
,7 @@ void wpa_supplicant_event(void *ctx, enu
+@@ -
2035,7 +2035
,7 @@ void wpa_supplicant_event(void *ctx, enu
}
}
@@
-200,7
+200,7
@@
struct hapd_interfaces *interfaces = ctx;
--- a/wpa_supplicant/wpa_priv.c
+++ b/wpa_supplicant/wpa_priv.c
struct hapd_interfaces *interfaces = ctx;
--- a/wpa_supplicant/wpa_priv.c
+++ b/wpa_supplicant/wpa_priv.c
-@@ -103
1,8 +1031
,8 @@ static void wpa_priv_send_ft_response(st
+@@ -103
8,8 +1038
,8 @@ static void wpa_priv_send_ft_response(st
}
}
@@
-211,7
+211,7
@@
{
struct wpa_priv_interface *iface = ctx;
{
struct wpa_priv_interface *iface = ctx;
-@@ -1
095,7 +1095
,7 @@ void wpa_supplicant_event(void *ctx, enu
+@@ -1
102,7 +1102
,7 @@ void wpa_supplicant_event(void *ctx, enu
}
}
@@
-220,7
+220,7
@@
union wpa_event_data *data)
{
struct wpa_priv_global *global = ctx;
union wpa_event_data *data)
{
struct wpa_priv_global *global = ctx;
-@@ -12
07,6 +1207
,8 @@ int main(int argc, char *argv[])
+@@ -12
15,6 +1215
,8 @@ int main(int argc, char *argv[])
if (os_program_init())
return -1;
if (os_program_init())
return -1;
@@
-231,7
+231,7
@@
os_memset(&global, 0, sizeof(global));
--- a/wpa_supplicant/events.c
+++ b/wpa_supplicant/events.c
os_memset(&global, 0, sizeof(global));
--- a/wpa_supplicant/events.c
+++ b/wpa_supplicant/events.c
-@@ -4
176,8 +4176,8 @@ static void wpas_event_assoc_reject(stru
+@@ -4
579,8 +4579,8 @@ static void wpas_event_unprot_beacon(str
}
}
@@
-242,7
+242,7
@@
{
struct wpa_supplicant *wpa_s = ctx;
int resched;
{
struct wpa_supplicant *wpa_s = ctx;
int resched;
-@@ -
4951,7 +4951
,7 @@ void wpa_supplicant_event(void *ctx, enu
+@@ -
5398,7 +5398
,7 @@ void wpa_supplicant_event(void *ctx, enu
}
}
@@
-253,7
+253,7
@@
struct wpa_supplicant *wpa_s;
--- a/wpa_supplicant/wpa_supplicant.c
+++ b/wpa_supplicant/wpa_supplicant.c
struct wpa_supplicant *wpa_s;
--- a/wpa_supplicant/wpa_supplicant.c
+++ b/wpa_supplicant/wpa_supplicant.c
-@@ -6
087,7 +6087
,6 @@ struct wpa_interface * wpa_supplicant_ma
+@@ -6
594,7 +6594
,6 @@ struct wpa_interface * wpa_supplicant_ma
return NULL;
}
return NULL;
}
@@
-261,7
+261,7
@@
/**
* wpa_supplicant_match_existing - Match existing interfaces
* @global: Pointer to global data from wpa_supplicant_init()
/**
* wpa_supplicant_match_existing - Match existing interfaces
* @global: Pointer to global data from wpa_supplicant_init()
-@@ -6
124,6 +6123
,11 @@ static int wpa_supplicant_match_existing
+@@ -6
631,6 +6630
,11 @@ static int wpa_supplicant_match_existing
#endif /* CONFIG_MATCH_IFACE */
#endif /* CONFIG_MATCH_IFACE */
@@
-273,7
+273,7
@@
/**
* wpa_supplicant_add_iface - Add a new network interface
/**
* wpa_supplicant_add_iface - Add a new network interface
-@@ -6
380,6 +6384
,8 @@ struct wpa_global * wpa_supplicant_init(
+@@ -6
887,6 +6891
,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 */
#ifndef CONFIG_NO_WPA_MSG
wpa_msg_register_ifname_cb(wpa_supplicant_msg_ifname_cb);
#endif /* CONFIG_NO_WPA_MSG */
@@
-284,7
+284,7
@@
wpa_debug_open_file(params->wpa_debug_file_path);
--- a/hostapd/main.c
+++ b/hostapd/main.c
wpa_debug_open_file(params->wpa_debug_file_path);
--- a/hostapd/main.c
+++ b/hostapd/main.c
-@@ -59
2,6 +592
,11 @@ fail:
+@@ -59
0,6 +590
,11 @@ fail:
return -1;
}
return -1;
}
@@
-296,7
+296,7
@@
#ifdef CONFIG_WPS
static int gen_uuid(const char *txt_addr)
#ifdef CONFIG_WPS
static int gen_uuid(const char *txt_addr)
-@@ -6
77,6 +682
,8 @@ int main(int argc, char *argv[])
+@@ -6
84,6 +689
,8 @@ int main(int argc, char *argv[])
return -1;
#endif /* CONFIG_DPP */
return -1;
#endif /* CONFIG_DPP */
@@
-320,7
+320,7
@@
{
--- a/wpa_supplicant/eapol_test.c
+++ b/wpa_supplicant/eapol_test.c
{
--- a/wpa_supplicant/eapol_test.c
+++ b/wpa_supplicant/eapol_test.c
-@@ -
29,7 +29
,12 @@
+@@ -
30,7 +30
,12 @@
#include "ctrl_iface.h"
#include "pcsc_funcs.h"
#include "wpas_glue.h"
#include "ctrl_iface.h"
#include "pcsc_funcs.h"
#include "wpas_glue.h"
@@
-333,7
+333,7
@@
const struct wpa_driver_ops *const wpa_drivers[] = { NULL };
const struct wpa_driver_ops *const wpa_drivers[] = { NULL };
-@@ -129
6,6 +1301
,10 @@ static void usage(void)
+@@ -129
2,6 +1297
,10 @@ static void usage(void)
"option several times.\n");
}
"option several times.\n");
}
@@
-344,7
+344,7
@@
int main(int argc, char *argv[])
{
int main(int argc, char *argv[])
{
-@@ -131
6,6 +1325
,8 @@ int main(int argc, char *argv[])
+@@ -131
2,6 +1321
,8 @@ int main(int argc, char *argv[])
if (os_program_init())
return -1;
if (os_program_init())
return -1;