summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHu Wang <huw@codeaurora.org>2017-07-14 17:07:22 +0800
committersnandini <snandini@codeaurora.org>2017-07-18 00:31:24 -0700
commitdd225a474e5fb4c7e4935a19a13e437ecbcaf673 (patch)
tree8ac9236fc61a4c853f0b59e387510bcedcad1481
parent8c9ecf9a4e057b8d40f8ab3d7bf3f9e51426d059 (diff)
qcacld-2.0: Don't set default key for WAPI network
qcacld-3.0 to qcacld-2.0 propagation 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 76014d97300c..a82849c5d601 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -20138,6 +20138,10 @@ static int __wlan_hdd_cfg80211_set_default_key( struct wiphy *wiphy,
(pAdapter->device_mode == WLAN_HDD_P2P_CLIENT)) {
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)) {
/* If default key index is not same as previous one,