From 2a3fd3981ae6d6e357b98d249f3d96e150e69b29 Mon Sep 17 00:00:00 2001 From: Rachit Kankane Date: Thu, 6 Dec 2018 14:03:57 +0530 Subject: [PATCH] qcacld-3.0: Enable FT_IEEE8021X and FT_PSK for Genoa Enable FEATURE_WLAN_FT_IEEE8021X and FEATURE_WLAN_FT_PSK for Genoa as targeted kernel version is 4.4. Change-Id: I599be887b0021e7f53622c840dc76d5e3b47376a CRs-Fixed: 2359886 --- Kbuild | 3 +++ configs/genoa.common | 2 ++ core/hdd/src/wlan_hdd_cfg80211.c | 8 -------- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/Kbuild b/Kbuild index 1423bae725..bbe1f0eb5d 100644 --- a/Kbuild +++ b/Kbuild @@ -2260,6 +2260,9 @@ cppflags-$(CONFIG_CRYPTO_COMPONENT) += -DWLAN_CONV_CRYPTO_SUPPORTED \ -DWLAN_CRYPTO_FILS_OS_DERIVATIVE \ -DWLAN_CRYPTO_OMAC1_OS_DERIVATIVE +cppflags-$(CONFIG_FEATURE_WLAN_FT_IEEE8021X) += -DFEATURE_WLAN_FT_IEEE8021X +cppflags-$(CONFIG_FEATURE_WLAN_FT_PSK) += -DFEATURE_WLAN_FT_PSK + #Enable host 11d scan cppflags-$(CONFIG_HOST_11D_SCAN) += -DHOST_11D_SCAN diff --git a/configs/genoa.common b/configs/genoa.common index 7ae153f60e..5dbfe36f2a 100644 --- a/configs/genoa.common +++ b/configs/genoa.common @@ -5,6 +5,8 @@ CONFIG_SUPPORT_11AX := y CONFIG_160MHZ_SUPPORT := y CONFIG_FEATURE_STATS_EXT := n CONFIG_QCA_IBSS_SUPPORT := y +CONFIG_FEATURE_WLAN_FT_IEEE8021X := y +CONFIG_FEATURE_WLAN_FT_PSK := y #required features CONFIG_FEATURE_WLAN_RMC := n diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c index efa2053b57..e71f301129 100644 --- a/core/hdd/src/wlan_hdd_cfg80211.c +++ b/core/hdd/src/wlan_hdd_cfg80211.c @@ -173,14 +173,6 @@ .flags = flag, \ } -#ifndef WLAN_AKM_SUITE_FT_8021X -#define WLAN_AKM_SUITE_FT_8021X 0x000FAC03 -#endif - -#ifndef WLAN_AKM_SUITE_FT_PSK -#define WLAN_AKM_SUITE_FT_PSK 0x000FAC04 -#endif - #define IS_DFS_MODE_VALID(mode) ((mode >= DFS_MODE_NONE && \ mode <= DFS_MODE_DEPRIORITIZE)) /*