diff options
| author | Felix Fietkau <nbd@nbd.name> | 2016-07-18 13:36:24 +0200 |
|---|---|---|
| committer | Felix Fietkau <nbd@nbd.name> | 2016-07-18 13:37:10 +0200 |
| commit | 75329fc1618c74d3b52e1ecc52c571babbb6b611 (patch) | |
| tree | 4035262c80a2950427f3ad95de577540a6041baa | |
| parent | 9780b2dd93335bb5fbf19f8a5bd61cd780720fee (diff) | |
| download | upstream-75329fc1618c74d3b52e1ecc52c571babbb6b611.tar.gz upstream-75329fc1618c74d3b52e1ecc52c571babbb6b611.tar.bz2 upstream-75329fc1618c74d3b52e1ecc52c571babbb6b611.zip | |
hostapd: fix VLAN support in full wpad builds
Suppress -DCONFIG_NO_VLAN if CONFIG_IBSS_RSN is enabled
Signed-off-by: Felix Fietkau <nbd@nbd.name>
| -rw-r--r-- | package/network/services/hostapd/patches/200-multicall.patch | 20 | ||||
| -rw-r--r-- | package/network/services/hostapd/patches/380-disable_ctrl_iface_mib.patch | 2 |
2 files changed, 16 insertions, 6 deletions
diff --git a/package/network/services/hostapd/patches/200-multicall.patch b/package/network/services/hostapd/patches/200-multicall.patch index e9d49d40fa..7d83ee8121 100644 --- a/package/network/services/hostapd/patches/200-multicall.patch +++ b/package/network/services/hostapd/patches/200-multicall.patch @@ -72,7 +72,17 @@ ifndef CONFIG_NO_GITVER # Add VERSION_STR postfix for builds from a git repository -@@ -803,6 +804,10 @@ ifdef CONFIG_DYNAMIC_EAP_METHODS +@@ -312,7 +313,9 @@ endif + ifdef CONFIG_IBSS_RSN + NEED_RSN_AUTHENTICATOR=y + CFLAGS += -DCONFIG_IBSS_RSN ++ifndef MULTICALL + CFLAGS += -DCONFIG_NO_VLAN ++endif + OBJS += ibss_rsn.o + endif + +@@ -803,6 +806,10 @@ ifdef CONFIG_DYNAMIC_EAP_METHODS CFLAGS += -DCONFIG_DYNAMIC_EAP_METHODS LIBS += -ldl -rdynamic endif @@ -83,7 +93,7 @@ endif ifdef CONFIG_MACSEC -@@ -823,9 +828,11 @@ NEED_EAP_COMMON=y +@@ -823,9 +830,11 @@ NEED_EAP_COMMON=y NEED_RSN_AUTHENTICATOR=y CFLAGS += -DCONFIG_AP OBJS += ap.o @@ -95,7 +105,7 @@ OBJS += ../src/ap/hostapd.o OBJS += ../src/ap/wpa_auth_glue.o OBJS += ../src/ap/utils.o -@@ -898,10 +905,18 @@ endif +@@ -898,10 +907,18 @@ endif ifdef CONFIG_HS20 OBJS += ../src/ap/hs20.o endif @@ -114,7 +124,7 @@ NEED_AES_WRAP=y OBJS += ../src/ap/wpa_auth.o OBJS += ../src/ap/wpa_auth_ie.o -@@ -1680,6 +1695,12 @@ wpa_priv: $(BCHECK) $(OBJS_priv) +@@ -1680,6 +1697,12 @@ wpa_priv: $(BCHECK) $(OBJS_priv) $(OBJS_c) $(OBJS_t) $(OBJS_t2) $(OBJS) $(BCHECK) $(EXTRA_progs): .config @@ -127,7 +137,7 @@ wpa_supplicant: $(BCHECK) $(OBJS) $(EXTRA_progs) $(Q)$(LDO) $(LDFLAGS) -o wpa_supplicant $(OBJS) $(LIBS) $(EXTRALIBS) @$(E) " LD " $@ -@@ -1782,6 +1803,12 @@ endif +@@ -1782,6 +1805,12 @@ endif -e 's|\@DBUS_INTERFACE\@|$(DBUS_INTERFACE)|g' $< >$@ @$(E) " sed" $< diff --git a/package/network/services/hostapd/patches/380-disable_ctrl_iface_mib.patch b/package/network/services/hostapd/patches/380-disable_ctrl_iface_mib.patch index ef9c9db9a5..9e815e96a1 100644 --- a/package/network/services/hostapd/patches/380-disable_ctrl_iface_mib.patch +++ b/package/network/services/hostapd/patches/380-disable_ctrl_iface_mib.patch @@ -30,7 +30,7 @@ reply_len = -1; --- a/wpa_supplicant/Makefile +++ b/wpa_supplicant/Makefile -@@ -872,6 +872,9 @@ ifdef CONFIG_MBO +@@ -874,6 +874,9 @@ ifdef CONFIG_MBO OBJS += ../src/ap/mbo_ap.o endif ifdef CONFIG_CTRL_IFACE |