wlan: Fixed the compilation errors when enabling BUILD_DIAG_VERSION
Fixed the compilation errors when we enable BUILD_DIAG_VERSION to enable
the diag event&logging.
Change-Id: I426fe25b9033440e5d534b8bf0cc60ab9f0a18c0
CRs-fixed: 482978
diff --git a/CORE/MAC/src/pe/lim/limProcessMlmRspMessages.c b/CORE/MAC/src/pe/lim/limProcessMlmRspMessages.c
index 5469339..35a48d3 100644
--- a/CORE/MAC/src/pe/lim/limProcessMlmRspMessages.c
+++ b/CORE/MAC/src/pe/lim/limProcessMlmRspMessages.c
@@ -4038,11 +4038,9 @@
{
// Send LIM_MLM_ADDBA_CNF to LIM
tpLimMlmAddBACnf pMlmAddBACnf;
- tpPESession psessionEntry;
+ tpPESession psessionEntry = NULL;
tpAddBAParams pAddBAParams = (tpAddBAParams) limMsgQ->bodyptr;
-#ifdef FEATURE_WLAN_DIAG_SUPPORT_LIM //FEATURE_WLAN_DIAG_SUPPORT
- limDiagEventReport(pMac, WLAN_PE_DIAG_HAL_ADDBA_RSP_EVENT, psessionEntry, 0, 0);
-#endif //FEATURE_WLAN_DIAG_SUPPORT
+
//now LIM can process any defer message.
SET_LIM_PROCESS_DEFD_MESGS(pMac, true);
if (pAddBAParams == NULL) {
diff --git a/CORE/SME/src/QoS/sme_Qos.c b/CORE/SME/src/QoS/sme_Qos.c
index 21bb864..4ad6ea0 100644
--- a/CORE/SME/src/QoS/sme_Qos.c
+++ b/CORE/SME/src/QoS/sme_Qos.c
@@ -3975,6 +3975,9 @@
sme_QosACInfo *pACInfo;
sme_QosEdcaAcType ac;
#endif
+#ifdef FEATURE_WLAN_DIAG_SUPPORT
+ WLAN_VOS_DIAG_EVENT_DEF(qos, vos_event_wlan_qos_payload_type);
+#endif
pSession = &sme_QosCb.sessionInfo[sessionId];
@@ -4003,9 +4006,7 @@
}
#endif
-#ifdef FEATURE_WLAN_DIAG_SUPPORT
- WLAN_VOS_DIAG_EVENT_DEF(qos, vos_event_wlan_qos_payload_type);
-#endif
+
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: Invoked on session %d with return code %d",
__func__, __LINE__,
diff --git a/CORE/SME/src/csr/csrApiRoam.c b/CORE/SME/src/csr/csrApiRoam.c
index 8d86ea5..5edde86 100644
--- a/CORE/SME/src/csr/csrApiRoam.c
+++ b/CORE/SME/src/csr/csrApiRoam.c
@@ -4842,7 +4842,7 @@
pSession->pWapiRspIE[1] = (tANI_U8)nIeLen;
pIeBuf = pSession->pWapiRspIE + 2;
//copy upto akm_suite_count
- palCopyMemory(pMac->hHdd, pIeBuf, &pIesLocal->WAPI.version, 4);
+ palCopyMemory(pMac->hHdd, pIeBuf, &pIesLocal->WAPI.version, 2);
pIeBuf += 4;
if( pIesLocal->WAPI.akm_suite_count )
{
@@ -4860,8 +4860,13 @@
pIesLocal->WAPI.unicast_cipher_suite_count * 4);
pIeBuf += pIesLocal->WAPI.unicast_cipher_suite_count * 4;
}
- //gp_cipher_suite + preauth + reserved + bkid_count
- palCopyMemory(pMac->hHdd, pIeBuf, &pIesLocal->WAPI.multicast_cipher_suite, 8);
+ //gp_cipher_suite
+ palCopyMemory(pMac->hHdd, pIeBuf, pIesLocal->WAPI.multicast_cipher_suite, 4);
+ //preauth + reserved
+ palCopyMemory(pMac->hHdd, pIeBuf, pIesLocal->WAPI.multicast_cipher_suite + 4, 2);
+ //bkid_count
+ palCopyMemory(pMac->hHdd, pIeBuf, &pIesLocal->WAPI.bkid_count, 2);
+
pIeBuf += 8;
if( pIesLocal->WAPI.bkid_count )
{
@@ -8264,7 +8269,7 @@
#ifdef FEATURE_WLAN_DIAG_SUPPORT_CSR
tCsrRoamSession *pSession = CSR_GET_SESSION( pMac, sessionId );
WLAN_VOS_DIAG_EVENT_DEF(setKeyEvent, vos_event_wlan_security_payload_type);
- if(eCSR_ENCRYPT_TYPE_NONE != edType)
+ if(eSIR_ED_NONE != edType)
{
palZeroMemory(pMac->hHdd, &setKeyEvent, sizeof(vos_event_wlan_security_payload_type));
if( *(( tANI_U8 *)&pCommand->u.setKeyCmd.peerMac) & 0x01 )
@@ -8280,7 +8285,7 @@
setKeyEvent.encryptionModeMulticast = (v_U8_t)diagEncTypeFromCSRType(pSession->connectedProfile.mcEncryptionType);
}
palCopyMemory( pMac->hHdd, setKeyEvent.bssid, pSession->connectedProfile.bssid, 6 );
- if(CSR_IS_ENC_TYPE_STATIC(edType))
+ if(CSR_IS_ENC_TYPE_STATIC(pCommand->u.setKeyCmd.encType))
{
tANI_U32 defKeyId;
//It has to be static WEP here
@@ -8317,7 +8322,7 @@
smsLog( pMac, LOGE, FL(" error status %d"), status );
csrRoamCallCallback( pMac, sessionId, NULL, pCommand->u.setKeyCmd.roamId, eCSR_ROAM_SET_KEY_COMPLETE, eCSR_ROAM_RESULT_FAILURE);
#ifdef FEATURE_WLAN_DIAG_SUPPORT_CSR
- if(eCSR_ENCRYPT_TYPE_NONE != edType)
+ if(eSIR_ED_NONE != edType)
{
if( *(( tANI_U8 *)&pCommand->u.setKeyCmd.peerMac) & 0x01 )
{
@@ -9044,13 +9049,14 @@
eCsrRoamResult result = eCSR_ROAM_RESULT_MIC_ERROR_UNICAST;
#ifdef FEATURE_WLAN_DIAG_SUPPORT_CSR
{
+ WLAN_VOS_DIAG_EVENT_DEF(secEvent, vos_event_wlan_security_payload_type);
tCsrRoamSession *pSession = CSR_GET_SESSION( pMac, sessionId );
if(!pSession)
{
smsLog(pMac, LOGE, FL(" session %d not found "), sessionId);
return;
}
- WLAN_VOS_DIAG_EVENT_DEF(secEvent, vos_event_wlan_security_payload_type);
+
palZeroMemory(pMac->hHdd, &secEvent, sizeof(vos_event_wlan_security_payload_type));
secEvent.eventId = WLAN_SECURITY_EVENT_MIC_ERROR;
secEvent.encryptionModeMulticast =
@@ -9428,7 +9434,7 @@
palCopyMemory( pMac->hHdd, setKeyEvent.bssid, pSession->connectedProfile.bssid, 6 );
setKeyEvent.authMode =
(v_U8_t)diagAuthTypeFromCSRType(pSession->connectedProfile.AuthType);
- if( eSIR_SUCCESS != pRsp->statusCode )
+ if( eSIR_SME_SUCCESS != pRsp->statusCode )
{
setKeyEvent.status = WLAN_SECURITY_STATUS_FAILURE;
}
@@ -9548,7 +9554,7 @@
palCopyMemory( pMac->hHdd, removeKeyEvent.bssid, pSession->connectedProfile.bssid, 6 );
removeKeyEvent.authMode =
(v_U8_t)diagAuthTypeFromCSRType(pSession->connectedProfile.AuthType);
- if( eSIR_SUCCESS != pRsp->statusCode )
+ if( eSIR_SME_SUCCESS != pRsp->statusCode )
{
removeKeyEvent.status = WLAN_SECURITY_STATUS_FAILURE;
}
@@ -12567,6 +12573,8 @@
palZeroMemory( pMac->hHdd, pMsg, sizeof( tSirSmeGetWPSPBCSessionsReq ) );
pMsg->messageType = pal_cpu_to_be16((tANI_U16)eWNI_SME_GET_WPSPBC_SESSION_REQ);
pBuf = (tANI_U8 *)&pMsg->pUsrContext;
+ VOS_ASSERT(pBuf);
+
wTmpBuf = pBuf;
// pUsrContext
dwTmp = pal_cpu_to_be32((tANI_U32)pUsrContext);
@@ -15731,6 +15739,8 @@
pMsg->messageType = pal_cpu_to_be16((tANI_U16)eWNI_SME_UPDATE_APWPSIE_REQ);
pBuf = (tANI_U8 *)&pMsg->transactionId;
+ VOS_ASSERT(pBuf);
+
wTmpBuf = pBuf;
// transactionId
*pBuf = 0;
@@ -15772,7 +15782,8 @@
*pBuf = 0;
*( pBuf + 1 ) = 0;
pBuf += sizeof(tANI_U16);
-
+ VOS_ASSERT(pBuf);
+
// bssId
palCopyMemory( pMac->hHdd, (tSirMacAddr *)pBuf, &pSession->selfMacAddr, sizeof(tSirMacAddr) );
pBuf += sizeof(tSirMacAddr);
diff --git a/CORE/VOSS/src/vos_diag.c b/CORE/VOSS/src/vos_diag.c
index 45b8c28..78cafff 100644
--- a/CORE/VOSS/src/vos_diag.c
+++ b/CORE/VOSS/src/vos_diag.c
@@ -1,45 +1,23 @@
/*
- * Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.
- *
- * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
- *
- *
- * Permission to use, copy, modify, and/or distribute this software for
- * any purpose with or without fee is hereby granted, provided that the
- * above copyright notice and this permission notice appear in all
- * copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
- * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-/*
- * Copyright (c) 2012, The Linux Foundation. All rights reserved.
- *
- * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
- *
- *
- * Permission to use, copy, modify, and/or distribute this software for
- * any purpose with or without fee is hereby granted, provided that the
- * above copyright notice and this permission notice appear in all
- * copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
- * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-
+ * Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.
+ *
+ * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
+ *
+ *
+ * Permission to use, copy, modify, and/or distribute this software for
+ * any purpose with or without fee is hereby granted, provided that the
+ * above copyright notice and this permission notice appear in all
+ * copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
+ * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
+ * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
+ * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
+ * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+*/
/*============================================================================
FILE: vos_diag.c
@@ -47,9 +25,9 @@
DEPENDENCIES:
- Copyright (c) 2007 QUALCOMM Incorporated.
+ Copyright (c) 2007 Qualcomm Technologies, Inc.
All Rights Reserved.
- Qualcomm Confidential and Proprietary
+ Qualcomm Technologies Confidential and Proprietary
============================================================================*/
#include "vos_types.h"
@@ -141,7 +119,7 @@
tAniHdr *wmsg = NULL;
v_U8_t *pBuf;
- hdd_adapter_t *pAdapter;
+ struct hdd_context_s *pHddCtx;
v_CONTEXT_t pVosContext= NULL;
v_U16_t data_len;
v_U16_t total_len;
@@ -151,10 +129,10 @@
pVosContext = vos_get_global_context(VOS_MODULE_ID_SYS, NULL);
/*Get the Hdd Context */
- pAdapter = ((VosContextType*)(pVosContext))->pHDDContext;
+ pHddCtx = ((VosContextType*)(pVosContext))->pHDDContext;
/* Send the log data to the ptt app only if it is registered with the wlan driver*/
- if(pAdapter->ptt_pid)
+ if(pHddCtx->ptt_pid)
{
data_len = pHdr->len;
@@ -184,9 +162,9 @@
memcpy(pBuf, pHdr,data_len);
- if(pAdapter->ptt_pid)
+ if(pHddCtx->ptt_pid)
{
- if( ptt_sock_send_msg_to_app(wmsg, 0, ANI_NL_MSG_PUMAC, pAdapter->ptt_pid) < 0) {
+ if( ptt_sock_send_msg_to_app(wmsg, 0, ANI_NL_MSG_PUMAC, pHddCtx->ptt_pid) < 0) {
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR, ("Ptt Socket error sending message to the app!!\n"));
return;
@@ -216,7 +194,7 @@
tAniHdr *wmsg = NULL;
v_U8_t *pBuf;
- hdd_adapter_t *pAdapter;
+ struct hdd_context_s *pHddCtx;
v_CONTEXT_t pVosContext= NULL;
event_report_t *pEvent_report;
v_U16_t total_len;
@@ -225,11 +203,11 @@
pVosContext = vos_get_global_context(VOS_MODULE_ID_SYS, NULL);
/*Get the Hdd Context */
- pAdapter = ((VosContextType*)(pVosContext))->pHDDContext;
+ pHddCtx = ((VosContextType*)(pVosContext))->pHDDContext;
/* Send the log data to the ptt app only if it is registered with the wlan driver*/
- if(pAdapter->ptt_pid)
+ if(pHddCtx->ptt_pid)
{
total_len = sizeof(tAniHdr)+sizeof(event_report_t)+length;
@@ -255,7 +233,7 @@
memcpy(pBuf, pPayload,length);
- if( ptt_sock_send_msg_to_app(wmsg, 0, ANI_NL_MSG_PUMAC, pAdapter->ptt_pid) < 0) {
+ if( ptt_sock_send_msg_to_app(wmsg, 0, ANI_NL_MSG_PUMAC, pHddCtx->ptt_pid) < 0) {
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR, ("Ptt Socket error sending message to the app!!\n"));
return;