diff options
| author | Akash Patel <akashp@codeaurora.org> | 2014-11-14 17:29:17 -0800 |
|---|---|---|
| committer | Akash Patel <akashp@codeaurora.org> | 2014-11-14 17:31:22 -0800 |
| commit | a0d78ddf1bed2c93365c7ca05eb58df55cd696dd (patch) | |
| tree | 5c3e30294a08ce9ff57c219cb17949dba885685e | |
| parent | 40781fe517451d31cb84355f4a3434e8dc8ac11a (diff) | |
| parent | 1102a88ea189cf698a4f16e723c362475b041bb3 (diff) | |
Release 1.0.0.235A QCACLD WLAN Driver
Merge remote-tracking branch 'origin/caf/caf-wlan/master' into HEAD
* origin/caf/caf-wlan/master:
Cafstaging Release 1.0.0.235A
wlan: qcacld: Preauth Session Cleanup
Change-Id: I9443872c75ce405132ba486cc7c928d25a4679d2
| -rw-r--r-- | CORE/MAC/inc/qwlan_version.h | 2 | ||||
| -rw-r--r-- | CORE/MAC/src/pe/lim/limFT.c | 5 | ||||
| -rw-r--r-- | CORE/MAC/src/pe/lim/limSendManagementFrames.c | 1 | ||||
| -rw-r--r-- | CORE/MAC/src/pe/lim/limSession.c | 10 |
4 files changed, 10 insertions, 8 deletions
diff --git a/CORE/MAC/inc/qwlan_version.h b/CORE/MAC/inc/qwlan_version.h index 8b3b41ddf553..b0580be49cda 100644 --- a/CORE/MAC/inc/qwlan_version.h +++ b/CORE/MAC/inc/qwlan_version.h @@ -44,7 +44,7 @@ BRIEF DESCRIPTION: #define QWLAN_VERSION_EXTRA "" #define QWLAN_VERSION_BUILD 235 -#define QWLAN_VERSIONSTR "1.0.0.235" +#define QWLAN_VERSIONSTR "1.0.0.235A" #define AR6320_REV1_VERSION 0x5000000 diff --git a/CORE/MAC/src/pe/lim/limFT.c b/CORE/MAC/src/pe/lim/limFT.c index 0966660dccec..3bcbc9474e30 100644 --- a/CORE/MAC/src/pe/lim/limFT.c +++ b/CORE/MAC/src/pe/lim/limFT.c @@ -72,7 +72,6 @@ void limFTCleanupPreAuthInfo(tpAniSirGlobal pMac, tpPESession psessionEntry) { tpPESession pReAssocSessionEntry = NULL; tANI_U8 sessionId = 0; - if (!psessionEntry) { #if defined WLAN_FEATURE_VOWIFI_11R_DEBUG PELOGE(limLog(pMac, LOGE, "%s: psessionEntry is NULL", __func__);) @@ -127,8 +126,8 @@ void limFTCleanupPreAuthInfo(tpAniSirGlobal pMac, tpPESession psessionEntry) */ if (pReAssocSessionEntry->valid && pReAssocSessionEntry->limSmeState == eLIM_SME_WT_REASSOC_STATE) { - PELOGW(limLog( pMac, LOGW, FL("Deleting Preauth Session %d"), - pReAssocSessionEntry->peSessionId);) + limLog( pMac, LOG1, FL("Deleting Preauth Session %d"), + pReAssocSessionEntry->peSessionId); peDeleteSession(pMac, pReAssocSessionEntry); } } diff --git a/CORE/MAC/src/pe/lim/limSendManagementFrames.c b/CORE/MAC/src/pe/lim/limSendManagementFrames.c index eff1eb4aa45b..9ba8263ae2b4 100644 --- a/CORE/MAC/src/pe/lim/limSendManagementFrames.c +++ b/CORE/MAC/src/pe/lim/limSendManagementFrames.c @@ -3684,6 +3684,7 @@ eHalStatus limSendDeauthCnf(tpAniSirGlobal pMac) /// Receive path cleanup with dummy packet + limFTCleanupPreAuthInfo(pMac,psessionEntry); limCleanupRxPath(pMac, pStaDs,psessionEntry); /// Free up buffer allocated for mlmDeauthReq vos_mem_free(pMlmDeauthReq); diff --git a/CORE/MAC/src/pe/lim/limSession.c b/CORE/MAC/src/pe/lim/limSession.c index 74ef197748bb..9d7cd97623f9 100644 --- a/CORE/MAC/src/pe/lim/limSession.c +++ b/CORE/MAC/src/pe/lim/limSession.c @@ -299,8 +299,9 @@ tpPESession peCreateSession(tpAniSirGlobal pMac, pMac->lim.gpSession[i].fWaitForProbeRsp = 0; pMac->lim.gpSession[i].fIgnoreCapsChange = 0; - limLog(pMac, LOG1, FL("Create a new sessionId (%d) with BSSID: " - MAC_ADDRESS_STR " Max No. of STA %d"), + VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_DEBUG, + "Create a new PE session (%d) with BSSID: " + MAC_ADDRESS_STR " Max No. of STA %d", pMac->lim.gpSession[i].peSessionId, MAC_ADDR_ARRAY(bssid), numSta); @@ -526,8 +527,9 @@ void peDeleteSession(tpAniSirGlobal pMac, tpPESession psessionEntry) tANI_U16 n; TX_TIMER *timer_ptr; - limLog(pMac, LOGW, FL("Trying to delete a session %d Opmode %d BssIdx %d" - " BSSID: " MAC_ADDRESS_STR), psessionEntry->peSessionId, + VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_DEBUG, + "Trying to delete PE session %d Opmode %d BssIdx %d" + " BSSID: " MAC_ADDRESS_STR, psessionEntry->peSessionId, psessionEntry->operMode, psessionEntry->bssIdx, MAC_ADDR_ARRAY(psessionEntry->bssId)); |