From: Masashi Honma Date: Sun, 31 Oct 2021 23:03:37 +0000 (+0900) Subject: Ignore CONFIG_WIFI_DISPLAY without CONFIG_P2P X-Git-Tag: hostap_2_10~83 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bf161b6609bd0eeaacbe79a180835cc08f580f17;p=thirdparty%2Fhostap.git Ignore CONFIG_WIFI_DISPLAY without CONFIG_P2P Wi-Fi Display functionality needs P2P to be enabled. Ignore CONFIG_WIFI_DISPLAY if CONFIG_P2P is not enabled for the build. This avoids following compilation issue with invalid build configuration: ../src/ap/ap_drv_ops.c: In function 'hostapd_build_ap_extra_ies': ../src/ap/ap_drv_ops.c:163:10: error: 'struct hostapd_data' has no member named 'p2p_group' 163 | if (hapd->p2p_group) { | ^~ ../src/ap/ap_drv_ops.c:165:35: error: 'struct hostapd_data' has no member named 'p2p_group' 165 | a = p2p_group_assoc_resp_ie(hapd->p2p_group, P2P_SC_SUCCESS); | ^~ Signed-off-by: Masashi Honma --- diff --git a/wpa_supplicant/Android.mk b/wpa_supplicant/Android.mk index f539ce134..0aacafd4a 100644 --- a/wpa_supplicant/Android.mk +++ b/wpa_supplicant/Android.mk @@ -366,12 +366,11 @@ CONFIG_AP=y ifdef CONFIG_P2P_STRICT L_CFLAGS += -DCONFIG_P2P_STRICT endif -endif - ifdef CONFIG_WIFI_DISPLAY L_CFLAGS += -DCONFIG_WIFI_DISPLAY OBJS += wifi_display.c endif +endif ifdef CONFIG_PASN L_CFLAGS += -DCONFIG_PASN diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile index 737f7af9c..ce1c8b2e3 100644 --- a/wpa_supplicant/Makefile +++ b/wpa_supplicant/Makefile @@ -389,12 +389,11 @@ CONFIG_AP=y ifdef CONFIG_P2P_STRICT CFLAGS += -DCONFIG_P2P_STRICT endif -endif - ifdef CONFIG_WIFI_DISPLAY CFLAGS += -DCONFIG_WIFI_DISPLAY OBJS += wifi_display.o endif +endif ifdef CONFIG_PASN CFLAGS += -DCONFIG_PASN