summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHu Wang <huw@codeaurora.org>2017-06-20 19:03:29 +0800
committerNandini Suresh <snandini@codeaurora.org>2017-06-28 12:36:39 -0700
commit7f1c17fffee68f61e6d3e6b9de73e1994a30bfce (patch)
tree8149542b13fcc42caa6efa0e5ea9c15e49080a09
parent67df4d1eb0b842d59ce127b3c607370a9ef51618 (diff)
qcacld-3.0: Don't set default key for WAPI network
WAPI network no need to set default key, and this change ensures the same. Change-Id: I6b94777a57a6978a7abc56750fd475aaff2c8c94 CRs-Fixed: 2063926
-rw-r--r--core/hdd/src/wlan_hdd_cfg80211.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c
index 840aae0d2324..e8fbbaf68d89 100644
--- a/core/hdd/src/wlan_hdd_cfg80211.c
+++ b/core/hdd/src/wlan_hdd_cfg80211.c
@@ -12910,6 +12910,10 @@ static int __wlan_hdd_cfg80211_set_default_key(struct wiphy *wiphy,
(pAdapter->device_mode == QDF_P2P_CLIENT_MODE)) {
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) &&
(eCSR_ENCRYPT_TYPE_AES_GCMP !=