From f6ddc0cd3e17f0b803fe718ca469547a5e682f6b Mon Sep 17 00:00:00 2001 From: Nandha Kishore Easwaran Date: Thu, 22 Jun 2017 13:51:03 +0530 Subject: [PATCH] qcacmn: Change keyix in wlan_crypto_getkey for athkey tool wlan_crypto_getkey only gets key data for default index. Athkey get with idx 0 retrieves default key else, it will retrieve custom key data. Change-Id: I3d1d412f7f024b4ed40590be9b74c6a7fcec0303 --- umac/cmn_services/crypto/src/wlan_crypto_global_api.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/umac/cmn_services/crypto/src/wlan_crypto_global_api.c b/umac/cmn_services/crypto/src/wlan_crypto_global_api.c index 8e5f99689d0c..b73155ac932d 100644 --- a/umac/cmn_services/crypto/src/wlan_crypto_global_api.c +++ b/umac/cmn_services/crypto/src/wlan_crypto_global_api.c @@ -561,7 +561,10 @@ QDF_STATUS wlan_crypto_getkey(struct wlan_objmgr_vdev *vdev, return QDF_STATUS_E_INVAL; } - key = crypto_priv->key[crypto_priv->def_tx_keyid]; + if (req_key->keyix == WLAN_CRYPTO_KEYIX_NONE) + key = crypto_priv->key[crypto_priv->def_tx_keyid]; + else + key = crypto_priv->key[req_key->keyix]; if (!key) return QDF_STATUS_E_INVAL; } else { @@ -585,7 +588,10 @@ QDF_STATUS wlan_crypto_getkey(struct wlan_objmgr_vdev *vdev, return QDF_STATUS_E_INVAL; } - key = crypto_priv->key[crypto_priv->def_tx_keyid]; + if (req_key->keyix == WLAN_CRYPTO_KEYIX_NONE) + key = crypto_priv->key[crypto_priv->def_tx_keyid]; + else + key = crypto_priv->key[req_key->keyix]; if (!key) return QDF_STATUS_E_INVAL; }