commit 89e3cd84947160911b67410c437bd691a8fd9e9f
author Subrat Dash <sdash@codeaurora.org> Fri Mar 02 11:40:17 2018 +0530
committer Anjaneedevi Kapparapu <akappara@codeaurora.org> Wed Mar 14 15:42:11 2018 +0530
tree 61bf8407d68adf9c2a9911d16c70c04050ec5fef
parent 4bff0e01be65ca191223ba100871d3fbafa2840c

qcacld-2.0: Add config flag to disable 11AC in WAPI mode

Add config flag to kbuild for disabling 11AC feature
in WAPI mode.

CRs-Fixed: 2186671
Change-Id: I4724b881533eefc59408b6d50a08b4ebdabdf92f

CORE/HDD/src/wlan_hdd_cfg80211.c

diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c
index f805735..c2793ce 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -22222,6 +22222,10 @@
               hddDot11Mode = eHDD_DOT11_MODE_11ac;
           else
               hddDot11Mode = eHDD_DOT11_MODE_11n;
+#if defined(FEATURE_WLAN_WAPI) && defined(FEATURE_WLAN_WAPI_MODE_11AC_DISABLE)
+          if (pAdapter->wapi_info.nWapiMode)
+              hddDot11Mode = eHDD_DOT11_MODE_11n;
+#endif
 #else
           hddDot11Mode = eHDD_DOT11_MODE_11n;
 #endif

Kbuild

diff --git a/Kbuild b/Kbuild
index 57684d6..c386d37 100644
--- a/Kbuild
+++ b/Kbuild
@@ -1691,6 +1691,10 @@
 CDEFINES += -DFEATURE_WLAN_AUTO_SHUTDOWN
 endif
 
+ifeq ($(CONFIG_FEATURE_WLAN_WAPI_MODE_11AC_DISABLE), 1)
+CDEFINES += -DFEATURE_WLAN_WAPI_MODE_11AC_DISABLE
+endif
+
 KBUILD_CPPFLAGS += $(CDEFINES)
 
 # Currently, for versions of gcc which support it, the kernel Makefile