diff options
| author | Hema Aparna Medicharla <haparna@qti.qualcomm.com> | 2013-11-27 22:46:03 +0530 |
|---|---|---|
| committer | Prakash Dhavali <pdhavali@qca.qualcomm.com> | 2013-12-06 03:17:25 -0800 |
| commit | 4d04f21dc7578c1cbdfbd74125fc543834bb4078 (patch) | |
| tree | 6192a79820ee576773dcdbac0f66256b89d4b608 | |
| parent | a0b54a4c152f66833b2b4f284d9b621ffee09bb4 (diff) | |
cld: 11r: Revert the setting key after Pre-auth
- Revert Back Set Key along with the Config BSS command
as WMI doesnot have support for this
Change-Id: Ic44a2599579cd752d3cd15d5f616b0085859d6cd
CRs-fixed: 583166
| -rw-r--r-- | CORE/HDD/src/wlan_hdd_cfg80211.c | 8 | ||||
| -rw-r--r-- | CORE/HDD/src/wlan_hdd_wext.c | 8 | ||||
| -rw-r--r-- | CORE/SME/src/sme_common/sme_FTApi.c | 20 |
3 files changed, 4 insertions, 32 deletions
diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c index 2b853e02923c..cab47699ab02 100644 --- a/CORE/HDD/src/wlan_hdd_cfg80211.c +++ b/CORE/HDD/src/wlan_hdd_cfg80211.c @@ -3385,13 +3385,7 @@ static int wlan_hdd_cfg80211_add_key( struct wiphy *wiphy, is done. Save the key in the UMAC and include it in the ADD BSS request */ halStatus = sme_FTUpdateKey( WLAN_HDD_GET_HAL_CTX(pAdapter), &setKey); - if ( halStatus == eHAL_STATUS_FT_PREAUTH_KEY_SUCCESS ) - { - hddLog(VOS_TRACE_LEVEL_INFO_MED, - "%s: Update PreAuth Key success", __func__); - return 0; - } - else if ( halStatus == eHAL_STATUS_FT_PREAUTH_KEY_FAILED ) + if ( halStatus == eHAL_STATUS_FT_PREAUTH_KEY_FAILED ) { hddLog(VOS_TRACE_LEVEL_ERROR, "%s: Update PreAuth Key failed", __func__); diff --git a/CORE/HDD/src/wlan_hdd_wext.c b/CORE/HDD/src/wlan_hdd_wext.c index 2c50b3dde26d..faa5bb40ed56 100644 --- a/CORE/HDD/src/wlan_hdd_wext.c +++ b/CORE/HDD/src/wlan_hdd_wext.c @@ -3450,13 +3450,7 @@ static int iw_set_encodeext(struct net_device *dev, is done. Save the key in the UMAC and include it in the ADD BSS request */ halStatus = sme_FTUpdateKey( WLAN_HDD_GET_HAL_CTX(pAdapter), &setKey); - if ( halStatus == eHAL_STATUS_FT_PREAUTH_KEY_SUCCESS ) - { - hddLog(VOS_TRACE_LEVEL_INFO_MED, - "%s: Update PreAuth Key success", __func__); - return 0; - } - else if ( halStatus == eHAL_STATUS_FT_PREAUTH_KEY_FAILED ) + if ( halStatus == eHAL_STATUS_FT_PREAUTH_KEY_FAILED ) { hddLog(VOS_TRACE_LEVEL_ERROR, "%s: Update PreAuth Key failed", __func__); diff --git a/CORE/SME/src/sme_common/sme_FTApi.c b/CORE/SME/src/sme_common/sme_FTApi.c index a363009ac33d..6497f29b60da 100644 --- a/CORE/SME/src/sme_common/sme_FTApi.c +++ b/CORE/SME/src/sme_common/sme_FTApi.c @@ -383,24 +383,8 @@ eHalStatus sme_FTUpdateKey( tHalHandle hHal, tCsrRoamSetKey * pFTKeyInfo ) switch(pMac->ft.ftSmeContext.FTState) { case eFT_SET_KEY_WAIT: - if (sme_GetFTPreAuthState (hHal) == TRUE) - { - status = sme_FTSendUpdateKeyInd(pMac, pFTKeyInfo); - if (status != 0 ) - { - smsLog( pMac, LOGE, "%s: Key set failure %d", __func__, - status); - pMac->ft.ftSmeContext.setFTPTKState = FALSE; - status = eHAL_STATUS_FT_PREAUTH_KEY_FAILED; - } - else - { - pMac->ft.ftSmeContext.setFTPTKState = TRUE; - status = eHAL_STATUS_FT_PREAUTH_KEY_SUCCESS; - smsLog( pMac, LOG1, "%s: Key set success", __func__); - } - sme_SetFTPreAuthState(hHal, FALSE); - } + + status = eHAL_STATUS_FT_PREAUTH_KEY_FAILED; pMac->ft.ftSmeContext.FTState = eFT_START_READY; #ifdef WLAN_FEATURE_VOWIFI_11R_DEBUG smsLog( pMac, LOG1, "%s: state changed to %d status %d", __func__, |