commit b1f68cb2219018e79361506d40d9ebcd2b1cd1fb
author Hu Wang <huw@codeaurora.org> Wed Aug 23 20:01:49 2017 +0800
committer Hu Wang <huw@codeaurora.org> Wed Aug 23 20:05:32 2017 +0800
tree d93408c0f9eda019bb653fc975cedd68e9e398df
parent d6fdaf128320c6fe73ff6b43e6a09757c2e72520

wlan: Don't set default key for WAPI network

qcacld-3.0 to prima propagation

WAPI network no need to set default key, and this change ensures
the same.

Change-Id: I6b94777a57a6978a7abc56750fd475aaff2c8c94
CRs-Fixed: 2063926

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 e8c0449..81336cc 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -12760,6 +12760,10 @@
     {
         if ( (eCSR_ENCRYPT_TYPE_TKIP !=
                 pHddStaCtx->conn_info.ucEncryptionType) &&
+#ifdef FEATURE_WLAN_WAPI
+             (eCSR_ENCRYPT_TYPE_WPI !=
+                pHddStaCtx->conn_info.ucEncryptionType) &&
+#endif
              (eCSR_ENCRYPT_TYPE_AES !=
                 pHddStaCtx->conn_info.ucEncryptionType)
            )