From f141cdd2007c72c5ba9cf0753d2ae375accdf8ef Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Tue, 28 Jan 2020 14:12:08 +0100 Subject: [PATCH] hostapd: unconditionally enable ap/mesh for wpa-cli MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Without this change, wpa-cli features depend on which wpad build variant was used to build the wpa-cli package Signed-off-by: Felix Fietkau Tested-by: Jérôme Benoit [WRT1900AC v1] [added missing package version bump] Signed-off-by: Petr Štetiar (cherry picked from commit 03e9e4ba9ea8f00ff7c6f076f2cdc322e18cd3a4) --- package/network/services/hostapd/Makefile | 2 +- .../services/hostapd/patches/431-wpa_cli_ifdef.patch | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/package/network/services/hostapd/Makefile b/package/network/services/hostapd/Makefile index 48dff34942..354f0944a1 100644 --- a/package/network/services/hostapd/Makefile +++ b/package/network/services/hostapd/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=hostapd -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE_URL:=http://w1.fi/hostap.git PKG_SOURCE_PROTO:=git diff --git a/package/network/services/hostapd/patches/431-wpa_cli_ifdef.patch b/package/network/services/hostapd/patches/431-wpa_cli_ifdef.patch index 2c9fe28a1d..65c31c567f 100644 --- a/package/network/services/hostapd/patches/431-wpa_cli_ifdef.patch +++ b/package/network/services/hostapd/patches/431-wpa_cli_ifdef.patch @@ -1,11 +1,17 @@ --- a/wpa_supplicant/wpa_cli.c +++ b/wpa_supplicant/wpa_cli.c -@@ -26,6 +26,9 @@ +@@ -26,6 +26,15 @@ #include #endif /* ANDROID */ +#ifndef CONFIG_P2P +#define CONFIG_P2P ++#endif ++#ifndef CONFIG_AP ++#define CONFIG_AP ++#endif ++#ifndef CONFIG_MESH ++#define CONFIG_MESH +#endif static const char *const wpa_cli_version = -- 2.30.2