From ee2c6bb5e5b4099fdc29e9196711a3f9b1b1dff6 Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Mon, 2 Apr 2018 17:00:45 +0300 Subject: [PATCH] Remove CONFIG_IEEE80211R_AP=y build option from wpa_supplicant There is no existing mechanism for setting up AP mode functionality with FT enabled, so there is not really much point in having a build option for trying to include the AP-to-AP FT functionality into wpa_supplicant either. Since this build option results in failures to complete the build, simply remove it completely. This can be restored if there is ever desire to enable FT functionality in wpa_supplicant controlled AP mode. Signed-off-by: Jouni Malinen --- wpa_supplicant/Android.mk | 8 -------- wpa_supplicant/Makefile | 8 -------- wpa_supplicant/android.config | 4 ---- wpa_supplicant/defconfig | 4 ---- 4 files changed, 24 deletions(-) diff --git a/wpa_supplicant/Android.mk b/wpa_supplicant/Android.mk index 28fbbba6d..a6809956d 100644 --- a/wpa_supplicant/Android.mk +++ b/wpa_supplicant/Android.mk @@ -213,10 +213,6 @@ NEED_SHA256=y NEED_AES_OMAC1=y endif -ifdef CONFIG_IEEE80211R_AP -CONFIG_IEEE80211R=y -endif - ifdef CONFIG_IEEE80211R L_CFLAGS += -DCONFIG_IEEE80211R OBJS += src/rsn_supp/wpa_ft.c @@ -929,10 +925,6 @@ NEED_AES_WRAP=y OBJS += src/ap/wpa_auth.c OBJS += src/ap/wpa_auth_ie.c OBJS += src/ap/pmksa_cache_auth.c -ifdef CONFIG_IEEE80211R_AP -L_CFLAGS += -DCONFIG_IEEE80211R_AP -OBJS += src/ap/wpa_auth_ft.c -endif endif ifdef CONFIG_ACS diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile index c761c225a..09956bda3 100644 --- a/wpa_supplicant/Makefile +++ b/wpa_supplicant/Makefile @@ -246,10 +246,6 @@ NEED_SHA256=y NEED_AES_OMAC1=y endif -ifdef CONFIG_IEEE80211R_AP -CONFIG_IEEE80211R=y -endif - ifdef CONFIG_IEEE80211R CFLAGS += -DCONFIG_IEEE80211R OBJS += ../src/rsn_supp/wpa_ft.o @@ -970,10 +966,6 @@ NEED_AES_WRAP=y OBJS += ../src/ap/wpa_auth.o OBJS += ../src/ap/wpa_auth_ie.o OBJS += ../src/ap/pmksa_cache_auth.o -ifdef CONFIG_IEEE80211R_AP -CFLAGS += -DCONFIG_IEEE80211R_AP -OBJS += ../src/ap/wpa_auth_ft.o -endif endif ifdef CONFIG_ACS diff --git a/wpa_supplicant/android.config b/wpa_supplicant/android.config index 7dfaa0f14..c97f59131 100644 --- a/wpa_supplicant/android.config +++ b/wpa_supplicant/android.config @@ -366,10 +366,6 @@ CONFIG_IEEE80211W=y # IEEE Std 802.11r-2008 (Fast BSS Transition) for station mode CONFIG_IEEE80211R=y -# IEEE Std 802.11r-2008 (Fast BSS Transition) for AP mode (implies -# CONFIG_IEEE80211R). -#CONFIG_IEEE80211R_AP=y - # Add support for writing debug log to a file (/tmp/wpa_supplicant-log-#.txt) #CONFIG_DEBUG_FILE=y diff --git a/wpa_supplicant/defconfig b/wpa_supplicant/defconfig index 976ac0cb7..08f585779 100644 --- a/wpa_supplicant/defconfig +++ b/wpa_supplicant/defconfig @@ -384,10 +384,6 @@ CONFIG_BACKEND=file # IEEE Std 802.11r-2008 (Fast BSS Transition) for station mode #CONFIG_IEEE80211R=y -# IEEE Std 802.11r-2008 (Fast BSS Transition) for AP mode (implies -# CONFIG_IEEE80211R). -#CONFIG_IEEE80211R_AP=y - # Add support for writing debug log to a file (/tmp/wpa_supplicant-log-#.txt) #CONFIG_DEBUG_FILE=y