wlan: Convert PELOG1 to limlog and handle the compilation errors.
Convert useful logs which are PELOG1 to limlog (VOS TRACE) and
also few changes for compilation error.
Change-Id: I6a141deec7dbe364efbe0ef945ea8f9b5c73d4c4
CRs-fixed: 771131
diff --git a/CORE/MAC/src/pe/lim/limAdmitControl.c b/CORE/MAC/src/pe/lim/limAdmitControl.c
index bc1fb1b..9f3cb9d 100644
--- a/CORE/MAC/src/pe/lim/limAdmitControl.c
+++ b/CORE/MAC/src/pe/lim/limAdmitControl.c
@@ -1216,7 +1216,7 @@
if(pAddTsRspMsg->status == eHAL_STATUS_SUCCESS)
{
- PELOG1(limLog(pMac, LOG1, FL("Received successful ADDTS response from HAL "));)
+ limLog(pMac, LOG1, FL("Received successful ADDTS response from HAL "));
// Use the smesessionId and smetransactionId from the PE session context
limSendSmeAddtsRsp(pMac, rspReqd, eSIR_SME_SUCCESS, psessionEntry, pAddTsRspMsg->tspec,
psessionEntry->smeSessionId, psessionEntry->transactionId);
@@ -1224,7 +1224,7 @@
}
else
{
- PELOG1(limLog(pMac, LOG1, FL("Received failure ADDTS response from HAL "));)
+ limLog(pMac, LOG1, FL("Received failure ADDTS response from HAL "));
// Send DELTS action frame to AP
// 090803: Get peer MAC addr from session
diff --git a/CORE/MAC/src/pe/lim/limApi.c b/CORE/MAC/src/pe/lim/limApi.c
index e863950..1f8a91e 100644
--- a/CORE/MAC/src/pe/lim/limApi.c
+++ b/CORE/MAC/src/pe/lim/limApi.c
@@ -664,7 +664,7 @@
{
tSirResultCodes retCode = eSIR_SUCCESS;
- PELOG1(limLog(pMac, LOG1, FL(" enter"));)
+ limLog(pMac, LOG1, FL(" enter"));
if (pMac->lim.gLimSmeState == eLIM_SME_OFFLINE_STATE)
{
@@ -2002,7 +2002,7 @@
if (nShortSlot != psessionEntry->shortSlotTimeSupported)
{
// Short slot time capability of AP has changed. Adopt to it.
- PELOG1(limLog(pMac, LOG1, FL("Shortslot capability of AP changed: %d"), nShortSlot);)
+ limLog(pMac, LOG1, FL("Shortslot capability of AP changed: %d"), nShortSlot);
((tpSirMacCapabilityInfo)&psessionEntry->limCurrentBssCaps)->shortSlotTime = (tANI_U16)nShortSlot;
psessionEntry->shortSlotTimeSupported = nShortSlot;
pBeaconParams->fShortSlotTime = (tANI_U8) nShortSlot;
@@ -2076,7 +2076,7 @@
case ePMM_STATE_UAPSD_SLEEP:
case ePMM_STATE_UAPSD_WT_WAKEUP_RSP:
case ePMM_STATE_WOWLAN:
- PELOG1(limLog(pMac, LOG1, FL("Sending EXIT_BMPS_IND to SME "));)
+ limLog(pMac, LOG1, FL("Sending EXIT_BMPS_IND to SME "));
limSendExitBmpsInd(pMac, eSME_BMPS_STATUS_IND_RCVD);
break;
diff --git a/CORE/MAC/src/pe/lim/limAssocUtils.c b/CORE/MAC/src/pe/lim/limAssocUtils.c
index 2e9be90..3f36251 100644
--- a/CORE/MAC/src/pe/lim/limAssocUtils.c
+++ b/CORE/MAC/src/pe/lim/limAssocUtils.c
@@ -3264,7 +3264,7 @@
* Received SSID does not match with the one we've.
* Ignore received Beacon frame
*/
- PELOG1(limLog(pMac, LOG1, FL("SSID received in Beacon does not match"));)
+ limLog(pMac, LOG1, FL("SSID received in Beacon does not match"));
#ifdef WLAN_DEBUG
pMac->lim.gLimBcnSSIDMismatchCnt++;
#endif
diff --git a/CORE/MAC/src/pe/lim/limFT.c b/CORE/MAC/src/pe/lim/limFT.c
index a2a6835..bd400a4 100644
--- a/CORE/MAC/src/pe/lim/limFT.c
+++ b/CORE/MAC/src/pe/lim/limFT.c
@@ -1435,18 +1435,18 @@
}
pAddBssParams->extSetStaKeyParam.singleTidRc = val;
- PELOG1(limLog(pMac, LOG1, FL("Key valid %d"),
+ limLog(pMac, LOG1, FL("Key valid %d key len = %d"),
pAddBssParams->extSetStaKeyParamValid,
- pAddBssParams->extSetStaKeyParam.key[0].keyLength);)
+ pAddBssParams->extSetStaKeyParam.key[0].keyLength);
pAddBssParams->extSetStaKeyParam.staIdx = 0;
- PELOG1(limLog(pMac, LOG1,
- FL("BSSID = "MAC_ADDRESS_STR), MAC_ADDR_ARRAY(pKeyInfo->bssId));)
+ limLog(pMac, LOG1,
+ FL("BSSID = "MAC_ADDRESS_STR), MAC_ADDR_ARRAY(pKeyInfo->bssId));
if(pAddBssParams->extSetStaKeyParam.key[0].keyLength == 16)
{
- PELOG1(limLog(pMac, LOG1,
+ limLog(pMac, LOG1,
FL("BSS key = %02X-%02X-%02X-%02X-%02X-%02X-%02X- "
"%02X-%02X-%02X-%02X-%02X-%02X-%02X-%02X-%02X"),
pAddBssParams->extSetStaKeyParam.key[0].key[0],
@@ -1464,7 +1464,7 @@
pAddBssParams->extSetStaKeyParam.key[0].key[12],
pAddBssParams->extSetStaKeyParam.key[0].key[13],
pAddBssParams->extSetStaKeyParam.key[0].key[14],
- pAddBssParams->extSetStaKeyParam.key[0].key[15]);)
+ pAddBssParams->extSetStaKeyParam.key[0].key[15]);
}
return TRUE;
@@ -1651,7 +1651,7 @@
tpPESession psessionEntry = NULL;
int i = 0;
- PELOG1(limLog(pMac, LOG1, FL(" Received AGGR_QOS_RSP from HAL"));)
+ limLog(pMac, LOG1, FL(" Received AGGR_QOS_RSP from HAL"));
/* Need to process all the deferred messages enqueued since sending the
SIR_HAL_AGGR_ADD_TS_REQ */
diff --git a/CORE/MAC/src/pe/lim/limIbssPeerMgmt.c b/CORE/MAC/src/pe/lim/limIbssPeerMgmt.c
index 2a3477d..eeefc4e 100644
--- a/CORE/MAC/src/pe/lim/limIbssPeerMgmt.c
+++ b/CORE/MAC/src/pe/lim/limIbssPeerMgmt.c
@@ -656,7 +656,7 @@
(tANI_U8 *) &psessionEntry->pLimStartBssReq->ssId,
psessionEntry->pLimStartBssReq->ssId.length + 1);
- PELOG1(limLog(pMac, LOG1, FL("invoking ADD_BSS as part of coalescing!"));)
+ limLog(pMac, LOG1, FL("invoking ADD_BSS as part of coalescing!"));
if (limMlmAddBss(pMac, &mlmStartReq,psessionEntry) != eSIR_SME_SUCCESS)
{
PELOGE(limLog(pMac, LOGE, FL("AddBss failure"));)
@@ -905,7 +905,7 @@
if(!pMac->lim.cfgProtection.fromllb)
{
- PELOG1(limLog(pMac, LOG1, FL("protection from 11b is disabled"));)
+ limLog(pMac, LOG1, FL("protection from 11b is disabled"));
return;
}
@@ -946,21 +946,21 @@
{
tANI_U32 i;
- PELOG1(limLog(pMac,LOG1, FL("A STA is associated:"));
+ limLog(pMac,LOG1, FL("A STA is associated:"));
limLog(pMac,LOG1, FL("Addr : "));
- limPrintMacAddr(pMac, peerMacAddr, LOG1);)
+ limPrintMacAddr(pMac, peerMacAddr, LOG1);
for (i=0; i<LIM_PROT_STA_CACHE_SIZE; i++)
{
if (pMac->lim.protStaCache[i].active)
{
- PELOG1(limLog(pMac, LOG1, FL("Addr: "));)
- PELOG1(limPrintMacAddr(pMac, pMac->lim.protStaCache[i].addr, LOG1);)
+ limLog(pMac, LOG1, FL("Addr: "));
+ limPrintMacAddr(pMac, pMac->lim.protStaCache[i].addr, LOG1);
if (vos_mem_compare(pMac->lim.protStaCache[i].addr,
peerMacAddr, sizeof(tSirMacAddr)))
{
- PELOG1(limLog(pMac, LOG1, FL("matching cache entry at %d already active."), i);)
+ limLog(pMac, LOG1, FL("matching cache entry at %d already active."), i);
return;
}
}
@@ -1568,8 +1568,8 @@
if (pStaDs != NULL)
{
/// DPH node already exists for the peer
- PELOGW(limLog(pMac, LOGW, FL("DPH Node present for just learned peer"));)
- PELOG1(limPrintMacAddr(pMac, pPeerNode->peerMacAddr, LOG1);)
+ limLog(pMac, LOG1, FL("DPH Node present for just learned peer"));
+ limPrintMacAddr(pMac, pPeerNode->peerMacAddr, LOG1);
ibss_sta_info_update(pMac, pStaDs, pPeerNode,psessionEntry);
return eSIR_SUCCESS;
}
diff --git a/CORE/MAC/src/pe/lim/limLinkMonitoringAlgo.c b/CORE/MAC/src/pe/lim/limLinkMonitoringAlgo.c
index d10f72e..6d92f18 100644
--- a/CORE/MAC/src/pe/lim/limLinkMonitoringAlgo.c
+++ b/CORE/MAC/src/pe/lim/limLinkMonitoringAlgo.c
@@ -144,8 +144,8 @@
if((eLIM_BT_AMP_AP_ROLE == psessionEntry->limSystemRole) ||
(eLIM_AP_ROLE == psessionEntry->limSystemRole))
{
- PELOG1(limLog(pMac, LOG1, FL("SAP:lim Delete Station Context (staId: %d, assocId: %d) "),
- pMsg->staId, pMsg->assocId);)
+ limLog(pMac, LOG1, FL("SAP:lim Delete Station Context (staId: %d, assocId: %d) "),
+ pMsg->staId, pMsg->assocId);
/*
* Check if Deauth/Disassoc is triggered from Host.
* If mlmState is in some transient state then
@@ -567,8 +567,8 @@
* or in states other than link-established state.
* Log error.
*/
- PELOG1(limLog(pMac, LOG1, FL("received heartbeat timeout in state %d"),
- psessionEntry->limMlmState);)
+ limLog(pMac, LOG1, FL("received heartbeat timeout in state %d"),
+ psessionEntry->limMlmState);
limPrintMlmState(pMac, LOG1, psessionEntry->limMlmState);
pMac->lim.gLimHBfailureCntInOtherStates++;
limReactivateHeartBeatTimer(pMac, psessionEntry);
diff --git a/CORE/MAC/src/pe/lim/limProcessActionFrame.c b/CORE/MAC/src/pe/lim/limProcessActionFrame.c
index 275cbaa..a7eb2d6 100644
--- a/CORE/MAC/src/pe/lim/limProcessActionFrame.c
+++ b/CORE/MAC/src/pe/lim/limProcessActionFrame.c
@@ -100,8 +100,8 @@
return;
}
- PELOG1(limLog(pMac, LOG1, FL("Channel switch Mode == %d"),
- psessionEntry->gLimChannelSwitch.switchMode);)
+ limLog(pMac, LOG1, FL("Channel switch Mode == %d"),
+ psessionEntry->gLimChannelSwitch.switchMode);
if (psessionEntry->gLimChannelSwitch.switchMode == eSIR_CHANSW_MODE_SILENT ||
psessionEntry->gLimChannelSwitch.switchCount <= SIR_CHANSW_TX_STOP_MAX_COUNT)
@@ -165,7 +165,7 @@
------------------------------------------------------------*/
tSirRetStatus limStartChannelSwitch(tpAniSirGlobal pMac, tpPESession psessionEntry)
{
- PELOG1(limLog(pMac, LOG1, FL("Starting the channel switch"));)
+ limLog(pMac, LOG1, FL(" ENTER"));
/*If channel switch is already running and it is on a different session, just return*/
/*This need to be removed for MCC */
@@ -362,12 +362,12 @@
}
else
{
- PELOG1(limLog(pMac, LOG1, FL("LIM: Received action frame not from our BSS, dropping..."));)
+ limLog(pMac, LOG1, FL("LIM: Received action frame not from our BSS, dropping..."));
}
if (eSIR_SUCCESS != limStartChannelSwitch(pMac, psessionEntry))
{
- PELOG1(limLog(pMac, LOG1, FL("Could not start channel switch"));)
+ limLog(pMac, LOG1, FL("Could not start channel switch"));
}
vos_mem_free(pChannelSwitchFrame);
@@ -863,7 +863,7 @@
else
limLog(pMac, LOGE, FL("Self entry missing in Hash Table "));
- PELOG1(limLog(pMac, LOG1, FL("DeleteTS succeeded"));)
+ limLog(pMac, LOG1, FL("DeleteTS succeeded"));
#ifdef FEATURE_WLAN_ESE
#ifdef FEATURE_WLAN_ESE_UPLOAD
@@ -1065,8 +1065,8 @@
break;
default:
- PELOG1(limLog(pMac, LOG1, FL("Unknown Measurement Type %d "),
- pMeasReqFrame->measReqIE.measType);)
+ limLog(pMac, LOG1, FL("Unknown Measurement Type %d "),
+ pMeasReqFrame->measReqIE.measType);
break;
}
@@ -1098,7 +1098,7 @@
pBody = WDA_GET_RX_MPDU_DATA(pRxPacketInfo);
frameLen = WDA_GET_RX_PAYLOAD_LEN(pRxPacketInfo);
- PELOG1(limLog(pMac, LOG1, FL("****LIM: Processing TPC Request from peer ****"));)
+ limLog(pMac, LOG1, FL("****LIM: Processing TPC Request from peer ****"));
pTpcReqFrame = vos_mem_malloc(sizeof( tSirMacTpcReqActionFrame ));
if (NULL == pTpcReqFrame)
diff --git a/CORE/MAC/src/pe/lim/limProcessAssocRspFrame.c b/CORE/MAC/src/pe/lim/limProcessAssocRspFrame.c
index 84cae75..d558112 100644
--- a/CORE/MAC/src/pe/lim/limProcessAssocRspFrame.c
+++ b/CORE/MAC/src/pe/lim/limProcessAssocRspFrame.c
@@ -371,9 +371,9 @@
/// Received unexpected Re/Association Response frame
#ifdef WLAN_FEATURE_VOWIFI_11R_DEBUG
- PELOG1(limLog(pMac, LOG1, FL("Recieved Re/Assoc rsp in unexpected "
+ limLog(pMac, LOG1, FL("Recieved Re/Assoc rsp in unexpected "
"state %d on session=%d"),
- psessionEntry->limMlmState, psessionEntry->peSessionId);)
+ psessionEntry->limMlmState, psessionEntry->peSessionId);
#endif
// Log error
if (!pHdr->fc.retry)
@@ -552,13 +552,13 @@
vos_mem_copy(psessionEntry->tspecIes,
&pAssocRsp->TSPECInfo[0], psessionEntry->tspecLen);
}
- PELOG1(limLog(pMac, LOG1, FL(" Tspec EID present in assoc rsp "));)
+ limLog(pMac, LOG1, FL(" Tspec EID present in assoc rsp "));
}
else
{
psessionEntry->tspecLen = 0;
psessionEntry->tspecIes = NULL;
- PELOG1(limLog(pMac, LOG1, FL(" Tspec EID *NOT* present in assoc rsp "));)
+ limLog(pMac, LOG1, FL(" Tspec EID *NOT* present in assoc rsp "));
}
#endif
@@ -674,7 +674,7 @@
if (subType == LIM_REASSOC)
{
// Log success
- PELOG1(limLog(pMac, LOG1, FL("Successfully Reassociated with BSS"));)
+ limLog(pMac, LOG1, FL("Successfully Reassociated with BSS"));
#ifdef FEATURE_WLAN_ESE
{
tANI_U8 cnt = 0;
@@ -792,8 +792,8 @@
}
// Log success
- PELOG1(limLog(pMac, LOG1, FL("Successfully Associated with BSS "MAC_ADDRESS_STR),
- MAC_ADDR_ARRAY(pHdr->sa));)
+ limLog(pMac, LOG1, FL("Successfully Associated with BSS "MAC_ADDRESS_STR),
+ MAC_ADDR_ARRAY(pHdr->sa));
#ifdef FEATURE_WLAN_ESE
if(psessionEntry->eseContext.tsm.tsmInfo.state)
{
@@ -923,7 +923,7 @@
/* CR: vos packet memory is leaked when assoc rsp timeouted/failed. */
/* notify TL that association is failed so that TL can flush the cached frame */
- PELOG1(limLog(pMac, LOG1, FL("notify TL that association is failed"));)
+ limLog(pMac, LOG1, FL("notify TL that association is failed"));
WLANTL_AssocFailed (psessionEntry->staId);
vos_mem_free(pBeaconStruct);
diff --git a/CORE/MAC/src/pe/lim/limProcessAuthFrame.c b/CORE/MAC/src/pe/lim/limProcessAuthFrame.c
index 806ff12..abdaddc 100644
--- a/CORE/MAC/src/pe/lim/limProcessAuthFrame.c
+++ b/CORE/MAC/src/pe/lim/limProcessAuthFrame.c
@@ -178,9 +178,9 @@
{
// Received Auth frame from a BC/MC address
// Log error and ignore it
- PELOGE(limLog(pMac, LOGE,
- FL("received Auth frame from a BC/MC address - "));)
- PELOG1( limPrintMacAddr(pMac, pHdr->sa, LOG1);)
+ limLog(pMac, LOGE,
+ FL("received Auth frame from a BC/MC address - "));
+ limPrintMacAddr(pMac, pHdr->sa, LOGE);
return;
}
@@ -765,8 +765,9 @@
return;
}
- PELOG1(limLog(pMac, LOG1, FL("Alloc new data: %x peer "), pAuthNode);
- limPrintMacAddr(pMac, pHdr->sa, LOG1);)
+ limLog(pMac, LOG1,
+ FL("Alloc new data: peer "MAC_ADDRESS_STR),
+ MAC_ADDR_ARRAY(pHdr->sa));
vos_mem_copy((tANI_U8 *) pAuthNode->peerMacAddr,
pHdr->sa,
@@ -885,9 +886,9 @@
pAuthNode->fTimerStarted = 0;
limAddPreAuthNode(pMac, pAuthNode);
- PELOG1(limLog(pMac, LOG1, FL("Alloc new data: %x id %d peer "),
- pAuthNode, pAuthNode->authNodeIdx);)
- PELOG1(limPrintMacAddr(pMac, pHdr->sa, LOG1);)
+ limLog(pMac, LOG1,
+ FL("Alloc new data: id %d peer "MAC_ADDRESS_STR),
+ pAuthNode->authNodeIdx, MAC_ADDR_ARRAY(pHdr->sa));
/// Create and activate Auth Response timer
if (tx_timer_change_context(&pAuthNode->timer, pAuthNode->authNodeIdx) != TX_SUCCESS)
@@ -1032,10 +1033,10 @@
*/
// Log error
- PELOG1(limLog(pMac, LOG1,
+ limLog(pMac, LOG1,
FL("received Auth frame2 from peer in state %d, addr "),
- psessionEntry->limMlmState);)
- PELOG1(limPrintMacAddr(pMac, pHdr->sa, LOG1);)
+ psessionEntry->limMlmState);
+ limPrintMacAddr(pMac, pHdr->sa, LOG1);
return;
}
@@ -1115,8 +1116,9 @@
return;
}
- PELOG1(limLog(pMac, LOG1, FL("Alloc new data: %x peer "), pAuthNode);)
- PELOG1(limPrintMacAddr(pMac, pHdr->sa, LOG1);)
+ limLog(pMac, LOG1,
+ FL("Alloc new data: peer "MAC_ADDRESS_STR),
+ MAC_ADDR_ARRAY(pHdr->sa));
vos_mem_copy((tANI_U8 *) pAuthNode->peerMacAddr,
pMac->lim.gpLimMlmAuthReq->peerMacAddr,
@@ -1578,10 +1580,10 @@
*/
// Log error
- PELOG1(limLog(pMac, LOG1,
+ limLog(pMac, LOG1,
FL("received unexpected Auth frame4 from peer in state "
"%d, addr "MAC_ADDRESS_STR), psessionEntry->limMlmState,
- MAC_ADDR_ARRAY(pHdr->sa));)
+ MAC_ADDR_ARRAY(pHdr->sa));
return;
}
@@ -1659,8 +1661,9 @@
return;
}
- PELOG1(limLog(pMac, LOG1, FL("Alloc new data: %x peer "), pAuthNode);
- limPrintMacAddr(pMac, pHdr->sa, LOG1);)
+ limLog(pMac, LOG1,
+ FL("Alloc new data: peer " MAC_ADDRESS_STR),
+ MAC_ADDR_ARRAY(pHdr->sa));
vos_mem_copy((tANI_U8 *) pAuthNode->peerMacAddr,
pMac->lim.gpLimMlmAuthReq->peerMacAddr,
diff --git a/CORE/MAC/src/pe/lim/limProcessBeaconFrame.c b/CORE/MAC/src/pe/lim/limProcessBeaconFrame.c
index 51e8b90..72165cc 100644
--- a/CORE/MAC/src/pe/lim/limProcessBeaconFrame.c
+++ b/CORE/MAC/src/pe/lim/limProcessBeaconFrame.c
@@ -212,9 +212,9 @@
}
else
{
- PELOG1(limLog(pMac, LOG1, FL("Received Beacon in unexpected state %d"),
+ limLog(pMac, LOG1, FL("Received Beacon in unexpected state %d"),
psessionEntry->limMlmState);
- limPrintMlmState(pMac, LOG1, psessionEntry->limMlmState);)
+ limPrintMlmState(pMac, LOG1, psessionEntry->limMlmState);
#ifdef WLAN_DEBUG
pMac->lim.gLimUnexpBcnCnt++;
#endif
diff --git a/CORE/MAC/src/pe/lim/limProcessDeauthFrame.c b/CORE/MAC/src/pe/lim/limProcessDeauthFrame.c
index f0ad865..03b04dd 100644
--- a/CORE/MAC/src/pe/lim/limProcessDeauthFrame.c
+++ b/CORE/MAC/src/pe/lim/limProcessDeauthFrame.c
@@ -264,8 +264,8 @@
MAC_ADDR_ARRAY(pHdr->sa));)
if (limSearchPreAuthList(pMac, pHdr->sa))
{
- PELOG1(limLog(pMac, LOG1, FL("Preauth entry exist. "
- "Deleting... "));)
+ limLog(pMac, LOG1, FL("Preauth entry exist. "
+ "Deleting... "));
limDeletePreAuthNode(pMac, pHdr->sa);
}
return;
@@ -289,11 +289,11 @@
*/
// Log error
- PELOG1(limLog(pMac, LOG1,
+ limLog(pMac, LOG1,
FL("received Deauth frame state %d with failure "
"code %d from "MAC_ADDRESS_STR),
psessionEntry->limMlmState, reasonCode,
- MAC_ADDR_ARRAY(pHdr->sa));)
+ MAC_ADDR_ARRAY(pHdr->sa));
limRestoreFromAuthState(pMac, eSIR_SME_DEAUTH_WHILE_JOIN,
reasonCode,psessionEntry);
diff --git a/CORE/MAC/src/pe/lim/limProcessMessageQueue.c b/CORE/MAC/src/pe/lim/limProcessMessageQueue.c
index 21d1e1f..b87265e 100644
--- a/CORE/MAC/src/pe/lim/limProcessMessageQueue.c
+++ b/CORE/MAC/src/pe/lim/limProcessMessageQueue.c
@@ -1449,7 +1449,8 @@
if ( deferMsg == true )
{
- PELOG1(limLog(pMac, LOG1, FL("Defer message type=%X "), limMsg->type);)
+ limLog(pMac, LOG2, FL("Defer message type=%X "),
+ limMsg->type);
if (limDeferMsg(pMac, limMsg) != TX_SUCCESS)
{
PELOGE(limLog(pMac, LOGE, FL("Unable to Defer message(0x%X) limSmeState %d (prev sme state %d) sysRole %d mlm state %d (prev mlm state %d)"),
@@ -2577,10 +2578,13 @@
{
if(pMac->lim.gpSession[i].valid)
{
- PELOG1(limLog(pMac, LOG1, FL("Session[%d] sysRole(%d) limSmeState %d (prev sme state %d) mlm state %d (prev mlm state %d)"),
- i, pMac->lim.gpSession[i].limSystemRole, pMac->lim.gpSession[i].limSmeState,
- pMac->lim.gpSession[i].limPrevSmeState, pMac->lim.gpSession[i].limMlmState,
- pMac->lim.gpSession[i].limPrevMlmState);)
+ limLog(pMac, LOG1, FL("Session[%d] sysRole(%d) limSmeState %d "
+ "(prev sme state %d) mlm state %d (prev mlm state %d)"),
+ i, pMac->lim.gpSession[i].limSystemRole,
+ pMac->lim.gpSession[i].limSmeState,
+ pMac->lim.gpSession[i].limPrevSmeState,
+ pMac->lim.gpSession[i].limMlmState,
+ pMac->lim.gpSession[i].limPrevMlmState);
}
}
#endif //ifdef WLAN_DEBUG
diff --git a/CORE/MAC/src/pe/lim/limProcessMlmReqMessages.c b/CORE/MAC/src/pe/lim/limProcessMlmReqMessages.c
index fef279b..004cdb9 100644
--- a/CORE/MAC/src/pe/lim/limProcessMlmReqMessages.c
+++ b/CORE/MAC/src/pe/lim/limProcessMlmReqMessages.c
@@ -207,7 +207,7 @@
else
checkTraffic = eSIR_CHECK_ROAMING_SCAN;
- PELOG1(limLog(pMac, LOG1, FL("Calling limSendHalInitScanReq"));)
+ limLog(pMac, LOG1, FL("Calling limSendHalInitScanReq"));
limSendHalInitScanReq(pMac, eLIM_HAL_INIT_SCAN_WAIT_STATE, checkTraffic);
return ;
@@ -677,15 +677,15 @@
{
if ((eSIR_PASSIVE_SCAN == channelPair[i+1]) && TRUE == passiveToActive)
{
- PELOG1(limLog(pMac, LOG1, FL("Channel %d changed from Passive to Active"),
- channelNum);)
+ limLog(pMac, LOG1, FL("Channel %d changed from Passive to Active"),
+ channelNum);
channelPair[i+1] = eSIR_ACTIVE_SCAN;
break ;
}
if ((eSIR_ACTIVE_SCAN == channelPair[i+1]) && FALSE == passiveToActive)
{
- PELOG1(limLog(pMac, LOG1, FL("Channel %d changed from Active to Passive"),
- channelNum);)
+ limLog(pMac, LOG1, FL("Channel %d changed from Active to Passive"),
+ channelNum);
channelPair[i+1] = eSIR_PASSIVE_SCAN;
break ;
}
@@ -731,14 +731,14 @@
if (dfsChannelList->timeStamp[channelNum] == 0)
{
//Received first beacon; Convert DFS channel to Active channel.
- PELOG1(limLog(pMac, LOG1, FL("Received first beacon on DFS channel: %d"), channelNum);)
+ limLog(pMac, LOG1, FL("Received first beacon on DFS channel: %d"), channelNum);
limCovertChannelScanType(pMac,channelNum, passiveToActive);
}
dfsChannelList->timeStamp[channelNum] = vos_timer_get_system_time();
}
else
{
- PELOG1(limLog(pMac, LOG1, FL("Channel %d is Active"), channelNum);)
+ limLog(pMac, LOG1, FL("Channel %d is Active"), channelNum);
return;
}
if (!tx_timer_running(&pMac->lim.limTimers.gLimActiveToPassiveChannelTimer))
@@ -1250,9 +1250,9 @@
{
tANI_U8 channelNum;
- PELOG1(limLog(pMac, LOG1, FL("Continue SCAN : chan %d tot %d"),
+ limLog(pMac, LOG1, FL("Continue SCAN on chan %d, total chan %d"),
pMac->lim.gLimCurrentScanChannelId,
- pMac->lim.gpLimMlmScanReq->channelList.numChannels);)
+ pMac->lim.gpLimMlmScanReq->channelList.numChannels);
if (pMac->lim.gLimCurrentScanChannelId >
(tANI_U32) (pMac->lim.gpLimMlmScanReq->channelList.numChannels - 1)
@@ -1370,7 +1370,8 @@
//limCleanupMsgQ(pMac);
pMac->lim.gLimSystemInScanLearnMode = 0;
- PELOG1(limLog(pMac, LOG1, FL("Scan ended, took %d tu"), (tx_time_get() - pMac->lim.scanStartTime));)
+ limLog(pMac, LOG1, FL("Scan ended, took %ld tu"),
+ (tx_time_get() - pMac->lim.scanStartTime));
} /*** limRestorePreScanState() ***/
#ifdef FEATURE_OEM_DATA_SUPPORT
@@ -3844,7 +3845,7 @@
if (pMac->lim.gLimMlmState == eLIM_MLM_WT_PROBE_RESP_STATE &&
pMac->lim.gLimHalScanState != eLIM_HAL_FINISH_SCAN_WAIT_STATE)
{
- PELOG1(limLog(pMac, LOG1, FL("Scanning : min channel timeout occurred"));)
+ limLog(pMac, LOG1, FL("Scanning : min channel timeout occurred"));
/// Min channel timer timed out
pMac->lim.limTimers.gLimPeriodicProbeReqTimer.sessionId = 0xff;
@@ -3919,7 +3920,7 @@
pMac->lim.gLimMlmState == eLIM_MLM_PASSIVE_SCAN_STATE) &&
pMac->lim.gLimHalScanState != eLIM_HAL_FINISH_SCAN_WAIT_STATE)
{
- PELOG1(limLog(pMac, LOG1, FL("Scanning : Max channel timed out"));)
+ limLog(pMac, LOG1, FL("Scanning : Max channel timed out"));
/**
* MAX channel timer timed out
* Continue channel scan.
@@ -3993,7 +3994,7 @@
if(vos_timer_getCurrentState(&pPeriodicProbeReqTimer->vosTimer)
!= VOS_TIMER_STATE_STOPPED)
{
- PELOG1(limLog(pMac, LOG1, FL("Invalid state of timer"));)
+ limLog(pMac, LOG1, FL("Invalid state of timer"));
return;
}
@@ -4001,7 +4002,7 @@
(pPeriodicProbeReqTimer->sessionId != 0xff) && (pMac->lim.probeCounter < pMac->lim.maxProbe))
{
tLimMlmScanReq *pLimMlmScanReq = pMac->lim.gpLimMlmScanReq;
- PELOG1(limLog(pMac, LOG1, FL("Scanning : Periodic scanning"));)
+ limLog(pMac, LOG1, FL("Scanning : Periodic scanning"));
pMac->lim.probeCounter++;
/**
* Periodic channel timer timed out
@@ -4366,9 +4367,9 @@
// timedout for an STA.
pAuthNode->mlmState = eLIM_MLM_AUTH_RSP_TIMEOUT_STATE;
pAuthNode->fTimerStarted = 0;
- PELOG1( limLog(pMac, LOG1,
+ limLog(pMac, LOG1,
FL("AUTH rsp timedout for MAC address "MAC_ADDRESS_STR),
- MAC_ADDR_ARRAY(pAuthNode->peerMacAddr));)
+ MAC_ADDR_ARRAY(pAuthNode->peerMacAddr));
// Change timer to reactivate it in future
limDeactivateAndChangePerStaIdTimer(pMac,
@@ -4448,8 +4449,8 @@
WLANTL_AssocFailed (psessionEntry->staId);
// Log error
- PELOG1(limLog(pMac, LOG1,
- FL("Re/Association Response not received before timeout "));)
+ limLog(pMac, LOG1,
+ FL("Re/Association Response not received before timeout "));
if (( (psessionEntry->limSystemRole == eLIM_AP_ROLE) || (psessionEntry->limSystemRole == eLIM_BT_AMP_AP_ROLE) )||
( (psessionEntry->limMlmState != eLIM_MLM_WT_ASSOC_RSP_STATE) &&
@@ -4492,8 +4493,8 @@
//To remove the preauth node in case of fail to associate
if (limSearchPreAuthList(pMac, psessionEntry->bssId))
{
- PELOG1(limLog(pMac, LOG1, FL(" delete pre auth node for "
- MAC_ADDRESS_STR), MAC_ADDR_ARRAY(psessionEntry->bssId));)
+ limLog(pMac, LOG1, FL(" delete pre auth node for "
+ MAC_ADDRESS_STR), MAC_ADDR_ARRAY(psessionEntry->bssId));
limDeletePreAuthNode(pMac, psessionEntry->bssId);
}
diff --git a/CORE/MAC/src/pe/lim/limProcessMlmRspMessages.c b/CORE/MAC/src/pe/lim/limProcessMlmRspMessages.c
index fba462b..3e3383c 100644
--- a/CORE/MAC/src/pe/lim/limProcessMlmRspMessages.c
+++ b/CORE/MAC/src/pe/lim/limProcessMlmRspMessages.c
@@ -408,7 +408,7 @@
limLog(pMac, LOG1, FL("*** Started BSS in INFRA AP SIDE***"));
}
else
- PELOG1(limLog(pMac, LOG1, FL("*** Started BSS ***"));)
+ limLog(pMac, LOG1, FL("*** Started BSS ***"));
}
else
{
@@ -475,8 +475,8 @@
/// Process Join confirm from MLM
if (resultCode == eSIR_SME_SUCCESS)
{
- PELOG1(limLog(pMac, LOG1, FL("***SessionId:%d Joined ESS ***"),
- pLimMlmJoinCnf->sessionId);)
+ limLog(pMac, LOG1, FL("***SessionId: %d Joined ESS ***"),
+ pLimMlmJoinCnf->sessionId);
//Setup hardware upfront
//Done: 7-27-2009. JIM_FIX_ME sessionize the following function
if(limStaSendAddBssPreAssoc( pMac, false, psessionEntry) == eSIR_SUCCESS)
@@ -660,9 +660,9 @@
* Successful MAC based authentication
* Trigger Association with BSS
*/
- PELOG1(limLog(pMac, LOG1,
- FL("SessionId:%d Authenticated with BSS"),
- psessionEntry->peSessionId);)
+ limLog(pMac, LOG1,
+ FL("SessionId: %d Authenticated with BSS"),
+ psessionEntry->peSessionId);
pMlmAssocReq = vos_mem_malloc(sizeof(tLimMlmAssocReq));
if ( NULL == pMlmAssocReq )
{
@@ -853,11 +853,11 @@
if (((tLimMlmAssocCnf *) pMsgBuf)->resultCode != eSIR_SME_SUCCESS)
{
// Association failure
- PELOG1(limLog(pMac, LOG1,
- FL("SessionId:%d Association failure resultCode: resultCode:%d"
- "limSmeState:%d"), psessionEntry->peSessionId,
+ limLog(pMac, LOG1,
+ FL("SessionId: %d Association failure resultCode: %d"
+ "limSmeState: %d"), psessionEntry->peSessionId,
((tLimMlmAssocCnf *) pMsgBuf)->resultCode,
- psessionEntry->limSmeState);)
+ psessionEntry->limSmeState);
/* If driver gets deauth when its waiting for ADD_STA_RSP then we need
* to do DEL_STA followed by DEL_BSS. So based on below reason-code here
@@ -881,8 +881,8 @@
else
{
// Successful Association
- PELOG1(limLog(pMac, LOG1, FL("SessionId:%d Associated with BSS"),
- psessionEntry->peSessionId);)
+ limLog(pMac, LOG1, FL("SessionId: %d Associated with BSS"),
+ psessionEntry->peSessionId);
psessionEntry->limSmeState = eLIM_SME_LINK_EST_STATE;
MTRACE(macTrace(pMac, TRACE_CODE_SME_STATE, psessionEntry->peSessionId, psessionEntry->limSmeState));
/**
@@ -951,7 +951,7 @@
PELOGE(limLog(pMac, LOG1, FL("Rcv MLM_REASSOC_CNF with result code %d"), pLimMlmReassocCnf->resultCode);)
if (pLimMlmReassocCnf->resultCode == eSIR_SME_SUCCESS) {
// Successful Reassociation
- PELOG1(limLog(pMac, LOG1, FL("*** Reassociated with new BSS ***"));)
+ limLog(pMac, LOG1, FL("*** Reassociated with new BSS ***"));
psessionEntry->limSmeState = eLIM_SME_LINK_EST_STATE;
MTRACE(macTrace(pMac, TRACE_CODE_SME_STATE, psessionEntry->peSessionId, psessionEntry->limSmeState));
@@ -1074,8 +1074,8 @@
}
limSysProcessMmhMsgApi(pMac, &msgQ, ePROT);
- PELOG1(limLog(pMac, LOG1,
- FL("Create CNF_WAIT_TIMER after received LIM_MLM_REASSOC_IND"));)
+ limLog(pMac, LOG1,
+ FL("Create CNF_WAIT_TIMER after received LIM_MLM_REASSOC_IND"));
/*
** turn on a timer to detect the loss of REASSOC CNF
**/
@@ -1267,8 +1267,8 @@
#endif //FEATURE_WLAN_DIAG_SUPPORT
limSysProcessMmhMsgApi(pMac, &msgQ, ePROT);
- PELOG1(limLog(pMac, LOG1,
- FL("Create CNF_WAIT_TIMER after received LIM_MLM_ASSOC_IND"));)
+ limLog(pMac, LOG1,
+ FL("Create CNF_WAIT_TIMER after received LIM_MLM_ASSOC_IND"));
/*
** turn on a timer to detect the loss of ASSOC CNF
**/
@@ -1343,9 +1343,9 @@
MTRACE(macTrace(pMac, TRACE_CODE_SME_STATE, psessionEntry->peSessionId, psessionEntry->limSmeState));
break;
default: // eLIM_AP_ROLE //eLIM_BT_AMP_AP_ROLE
- PELOG1(limLog(pMac, LOG1,
- FL("*** Peer staId=%d Disassociated ***"),
- pMlmDisassocInd->aid);)
+ limLog(pMac, LOG1,
+ FL("*** Peer staId = %d Disassociated ***"),
+ pMlmDisassocInd->aid);
// Send SME_DISASOC_IND after Polaris cleanup
// (after receiving LIM_MLM_PURGE_STA_IND)
break;
@@ -1479,9 +1479,9 @@
default: // eLIM_AP_ROLE
{
- PELOG1(limLog(pMac, LOG1,
+ limLog(pMac, LOG1,
FL("*** Received Deauthentication from staId=%d ***"),
- pMlmDeauthInd->aid);)
+ pMlmDeauthInd->aid);
}
// Send SME_DEAUTH_IND after Polaris cleanup
// (after receiving LIM_MLM_PURGE_STA_IND)
@@ -1552,8 +1552,8 @@
if (pMlmDeauthCnf->resultCode == eSIR_SME_SUCCESS)
{
psessionEntry->limSmeState = eLIM_SME_IDLE_STATE;
- PELOG1(limLog(pMac, LOG1,
- FL("*** Deauthenticated with BSS ***"));)
+ limLog(pMac, LOG1,
+ FL("*** Deauthenticated with BSS ***"));
}
else
psessionEntry->limSmeState = psessionEntry->limPrevSmeState;
@@ -2126,8 +2126,8 @@
statusCode = eSIR_SME_REFUSED;
goto end;
}
- PELOG1(limLog( pMac, LOG1, FL("STA AssocID %d MAC "), pStaDs->assocId );
- limPrintMacAddr(pMac, pStaDs->staAddr, LOG1);)
+ limLog( pMac, LOG1, FL("STA AssocID %d MAC "), pStaDs->assocId );
+ limPrintMacAddr(pMac, pStaDs->staAddr, LOG1);
}
else
{
@@ -2385,8 +2385,8 @@
statusCode = eSIR_SME_REFUSED;
goto end;
}
- PELOG1(limLog( pMac, LOG1, FL("STA AssocID %d MAC "), pStaDs->assocId );
- limPrintMacAddr(pMac, pStaDs->staAddr, LOG1);)
+ limLog( pMac, LOG1, FL("STA AssocID %d MAC "), pStaDs->assocId );
+ limPrintMacAddr(pMac, pStaDs->staAddr, LOG1);
limLog( pMac, LOGW, FL( "DEL_STA_RSP received for assocID: %X"), pDelStaParams->assocId);
//we must complete all cleanup related to delSta before calling limDelBSS.
if( 0 != limMsgQ->bodyptr )
@@ -2656,7 +2656,7 @@
}
if( eHAL_STATUS_SUCCESS == pAddBssParams->status )
{
- PELOG1(limLog(pMac, LOG1, FL("WDA_ADD_BSS_RSP returned with eHAL_STATUS_SUCCESS"));)
+ limLog(pMac, LOG1, FL("WDA_ADD_BSS_RSP returned with eHAL_STATUS_SUCCESS"));
if (limSetLinkState(pMac, eSIR_LINK_IBSS_STATE,psessionEntry->bssId,
psessionEntry->selfMacAddr, NULL, NULL) != eSIR_SUCCESS )
goto end;
@@ -3977,7 +3977,7 @@
*/
if (pMac->lim.gpchangeChannelCallback)
{
- PELOG1(limLog( pMac, LOG1, "Channel changed hence invoke registered call back");)
+ limLog( pMac, LOG1, "Channel changed hence invoke registered call back");
if (eHAL_CHANNEL_SWITCH_SOURCE_CSA == pChnlParams->channelSwitchSrc )
{
if (IS_MCC_SUPPORTED && limIsLinkSuspended( pMac ) )
diff --git a/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c b/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c
index 47590aa..6cf274f 100644
--- a/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c
+++ b/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c
@@ -352,7 +352,7 @@
tANI_U16 smetransactionId;
- PELOG1(limLog(pMac, LOG1, FL("Received START_REQ"));)
+ limLog(pMac, LOG1, FL("Received SME_START_REQ"));
limGetSessionInfo(pMac,(tANI_U8 *)pMsgBuf,&smesessionId,&smetransactionId);
@@ -532,7 +532,7 @@
limDiagEventReport(pMac, WLAN_PE_DIAG_START_BSS_REQ_EVENT, NULL, 0, 0);
#endif //FEATURE_WLAN_DIAG_SUPPORT
- PELOG1(limLog(pMac, LOG1, FL("Received START_BSS_REQ"));)
+ limLog(pMac, LOG1, FL("Received SME_START_BSS_REQ"));
/* Global Sme state and mlm states are not defined yet, for BT-AMP Suppoprt . TO BE DONE */
if ( (pMac->lim.gLimSmeState == eLIM_SME_OFFLINE_STATE) ||
@@ -1635,7 +1635,7 @@
limDiagEventReport(pMac, WLAN_PE_DIAG_JOIN_REQ_EVENT, NULL, 0, 0);
#endif //FEATURE_WLAN_DIAG_SUPPORT
- PELOG1(limLog(pMac, LOG1, FL("Received SME_JOIN_REQ"));)
+ limLog(pMac, LOG1, FL("Received SME_JOIN_REQ"));
#ifdef WLAN_FEATURE_VOWIFI
/* Need to read the CFG here itself as this is used in limExtractAPCapability() below.
@@ -2037,8 +2037,8 @@
psessionEntry->spectrumMgtEnabled = TRUE;
}
- PELOG1(limLog(pMac,LOG1,FL("SessionId:%d MLM_JOIN_REQ is posted to MLM"
- "SM"),pMlmJoinReq->sessionId));
+ limLog(pMac,LOG1,FL("SessionId: %d LIM_MLM_JOIN_REQ is posted to MLM "
+ "SM"), pMlmJoinReq->sessionId);
/* Issue LIM_MLM_JOIN_REQ to MLM */
limPostMlmMessage(pMac, LIM_MLM_JOIN_REQ, (tANI_U32 *) pMlmJoinReq);
return;
@@ -2680,7 +2680,7 @@
tANI_U8 sessionId;
- PELOG1(limLog(pMac, LOG1, FL("received DISASSOC_CNF message"));)
+ limLog(pMac, LOG1, FL("received SME_DISASSOC_CNF message"));
status = limDisassocCnfSerDes(pMac, &smeDisassocCnf,(tANI_U8 *) pMsgBuf);
@@ -2926,7 +2926,12 @@
if (smeDeauthReq.reasonCode == eLIM_LINK_MONITORING_DEAUTH)
{
/// Deauthentication is triggered by Link Monitoring
- PELOG1(limLog(pMac, LOG1, FL("**** Lost link with AP ****"));)
+ limLog(pMac, LOG1,
+ FL("Deauthentication is triggered by Link Monitoring"));
+ limLog(pMac, LOG1,
+ FL("Set Trigger to eLIM_LINK_MONITORING_DEAUTH"));
+ limLog(pMac, LOG1,
+ FL("and Reason to eSIR_MAC_UNSPEC_FAILURE_REASON"));
deauthTrigger = eLIM_LINK_MONITORING_DEAUTH;
reasonCode = eSIR_MAC_UNSPEC_FAILURE_REASON;
}
@@ -3166,8 +3171,8 @@
tANI_U8 smesessionId;
tANI_U16 smetransactionId;
- PELOG1(limLog(pMac, LOG1,
- FL("received REMOVEKEY_REQ message"));)
+ limLog(pMac, LOG1,
+ FL("received SME_REMOVEKEY_REQ message"));
if(pMsgBuf == NULL)
{
@@ -3930,10 +3935,10 @@
* - wait for addts response from ap
* if ap, just ignore with error log
*/
- PELOG1(limLog(pMac, LOG1,
+ limLog(pMac, LOG1,
FL("Received SME_ADDTS_REQ (TSid %d, UP %d)"),
pSirAddts->req.tspec.tsinfo.traffic.tsid,
- pSirAddts->req.tspec.tsinfo.traffic.userPrio);)
+ pSirAddts->req.tspec.tsinfo.traffic.userPrio);
if ((psessionEntry->limSystemRole != eLIM_STA_ROLE)&&(psessionEntry->limSystemRole != eLIM_BT_AMP_STA_ROLE))
{
@@ -4030,7 +4035,7 @@
// ship out the message now
limSendAddtsReqActionFrame(pMac, peerMac, &pSirAddts->req,
psessionEntry);
- PELOG1(limLog(pMac, LOG1, "Sent ADDTS request");)
+ limLog(pMac, LOG1, FL("Sent ADDTS request"));
// start a timer to wait for the response
if (pSirAddts->timeout)
@@ -4103,9 +4108,9 @@
return;
}
- PELOG1(limLog(pMac, LOG1, FL("Sent DELTS request to station with "
- "assocId = %d MacAddr = "MAC_ADDRESS_STR),
- pDeltsReq->aid, MAC_ADDR_ARRAY(peerMacAddr));)
+ limLog(pMac, LOG1, FL("Sent DELTS request to station with "
+ "assocId = %d MacAddr = "MAC_ADDRESS_STR),
+ pDeltsReq->aid, MAC_ADDR_ARRAY(peerMacAddr));
limSendDeltsReqActionFrame(pMac, peerMacAddr, pDeltsReq->req.wmeTspecPresent, &pDeltsReq->req.tsinfo, &pDeltsReq->req.tspec,
psessionEntry);
@@ -4456,8 +4461,8 @@
tpSirUpdateParams pUpdateParams;
tpPESession psessionEntry;
- PELOG1(limLog(pMac, LOG1,
- FL("received HIDE_SSID message")););
+ limLog(pMac, LOG1,
+ FL("received SME_HIDE_SSID message"));
if(pMsgBuf == NULL)
{
@@ -4837,11 +4842,12 @@
}
#if defined(WLAN_VOWIFI_DEBUG) || defined(FEATURE_WLAN_ESE)
- PELOG1(limLog( pMac, LOG1, "%s:%d: Allocated memory for pMaxTxParams...will be freed in other module", __func__, __LINE__ );)
+ limLog( pMac, LOG1,
+ FL(" Allocated memory for pMaxTxParams, which will be freed in other module"));
#endif
if( pMaxTxParams == NULL )
{
- limLog( pMac, LOGE, "%s:%d: pMaxTxParams is NULL", __func__, __LINE__);
+ limLog( pMac, LOGE, FL("pMaxTxParams is NULL"));
return eSIR_FAILURE;
}
pMaxTxParams->power = txPower;
@@ -4851,7 +4857,7 @@
msgQ.type = WDA_SET_MAX_TX_POWER_REQ;
msgQ.bodyptr = pMaxTxParams;
msgQ.bodyval = 0;
- PELOG1(limLog(pMac, LOG1, FL("Posting WDA_SET_MAX_TX_POWER_REQ to WDA"));)
+ limLog(pMac, LOG1, FL("Posting WDA_SET_MAX_TX_POWER_REQ to WDA"));
MTRACE(macTraceMsgTx(pMac, pSessionEntry->peSessionId, msgQ.type));
retCode = wdaPostCtrlMsg(pMac, &msgQ);
if (eSIR_SUCCESS != retCode)
@@ -4987,9 +4993,9 @@
tpSirRegisterMgmtFrame pSmeReq = (tpSirRegisterMgmtFrame)pMsgBuf;
tpLimMgmtFrameRegistration pLimMgmtRegistration = NULL, pNext = NULL;
tANI_BOOLEAN match = VOS_FALSE;
- PELOG1(limLog(pMac, LOG1,
+ limLog(pMac, LOG1,
FL("registerFrame %d, frameType %d, matchLen %d"),
- pSmeReq->registerFrame, pSmeReq->frameType, pSmeReq->matchLen);)
+ pSmeReq->registerFrame, pSmeReq->frameType, pSmeReq->matchLen);
/* First check whether entry exists already*/
@@ -5809,24 +5815,24 @@
case eWNI_SME_ASSOC_CNF:
case eWNI_SME_REASSOC_CNF:
if (pMsg->type == eWNI_SME_ASSOC_CNF)
- PELOG1(limLog(pMac, LOG1, FL("Received ASSOC_CNF message"));)
+ limLog(pMac, LOG1, FL("Received ASSOC_CNF message"));
else
- PELOG1(limLog(pMac, LOG1, FL("Received REASSOC_CNF message"));)
+ limLog(pMac, LOG1, FL("Received REASSOC_CNF message"));
__limProcessSmeAssocCnfNew(pMac, pMsg->type, pMsgBuf);
break;
case eWNI_SME_ADDTS_REQ:
- PELOG1(limLog(pMac, LOG1, FL("Received ADDTS_REQ message"));)
+ limLog(pMac, LOG1, FL("Received ADDTS_REQ message"));
__limProcessSmeAddtsReq(pMac, pMsgBuf);
break;
case eWNI_SME_DELTS_REQ:
- PELOG1(limLog(pMac, LOG1, FL("Received DELTS_REQ message"));)
+ limLog(pMac, LOG1, FL("Received DELTS_REQ message"));
__limProcessSmeDeltsReq(pMac, pMsgBuf);
break;
case SIR_LIM_ADDTS_RSP_TIMEOUT:
- PELOG1(limLog(pMac, LOG1, FL("Received SIR_LIM_ADDTS_RSP_TIMEOUT message "));)
+ limLog(pMac, LOG1, FL("Received SIR_LIM_ADDTS_RSP_TIMEOUT message "));
limProcessSmeAddtsRspTimeout(pMac, pMsg->bodyval);
break;
diff --git a/CORE/MAC/src/pe/lim/limRoamingAlgo.c b/CORE/MAC/src/pe/lim/limRoamingAlgo.c
index 28fa775..465509f 100644
--- a/CORE/MAC/src/pe/lim/limRoamingAlgo.c
+++ b/CORE/MAC/src/pe/lim/limRoamingAlgo.c
@@ -152,8 +152,8 @@
tSirMacAddr bcAddr = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
tSirBackgroundScanMode backgroundScan;
- PELOG1(limLog(pMac, LOG1, FL("Background Scan: %d success, %d consec fail "),
- pMac->lim.gLimNumOfBackgroundScanSuccess, pMac->lim.gLimNumOfConsecutiveBkgndScanFailure);)
+ limLog(pMac, LOG1, FL("Background Scan: %d success, %d consec fail "),
+ pMac->lim.gLimNumOfBackgroundScanSuccess, pMac->lim.gLimNumOfConsecutiveBkgndScanFailure);
if (! limIsBackgroundScanAllowed(pMac))
{
diff --git a/CORE/MAC/src/pe/lim/limSecurityUtils.c b/CORE/MAC/src/pe/lim/limSecurityUtils.c
index 32251c0..968c348 100644
--- a/CORE/MAC/src/pe/lim/limSecurityUtils.c
+++ b/CORE/MAC/src/pe/lim/limSecurityUtils.c
@@ -211,7 +211,7 @@
{
pTempNode = pCurrNode->next;
- PELOG1(limLog(pMac, LOG1, FL("=====> limDeletePreAuthList "));)
+ limLog(pMac, LOG1, FL("=====> limDeletePreAuthList "));
limReleasePreAuthNode(pMac, pCurrNode);
pCurrNode = pTempNode;
@@ -365,10 +365,11 @@
pMac->lim.pLimPreAuthList = pTempNode->next;
- PELOG1(limLog(pMac, LOG1, FL("=====> limDeletePreAuthNode : first node to delete"));)
- PELOG1(limLog(pMac, LOG1, FL("Release data entry: %x id %d peer "),
- pTempNode, pTempNode->authNodeIdx);
- limPrintMacAddr(pMac, macAddr, LOG1);)
+ limLog(pMac, LOG1, FL(" first node to delete"));
+ limLog(pMac, LOG1,
+ FL(" Release data entry:%p idx %d peer: " MAC_ADDRESS_STR),
+ pTempNode, pTempNode->authNodeIdx,
+ MAC_ADDR_ARRAY(macAddr));
limReleasePreAuthNode(pMac, pTempNode);
return;
@@ -386,10 +387,10 @@
pPrevNode->next = pTempNode->next;
- PELOG1(limLog(pMac, LOG1, FL("=====> limDeletePreAuthNode : subsequent node to delete"));
- limLog(pMac, LOG1, FL("Release data entry: %x id %d peer "),
- pTempNode, pTempNode->authNodeIdx);
- limPrintMacAddr(pMac, macAddr, LOG1);)
+ limLog(pMac, LOG1, FL(" subsequent node to delete"));
+ limLog(pMac, LOG1,
+ FL("Release data entry: %p id %d peer: "MAC_ADDRESS_STR),
+ pTempNode, pTempNode->authNodeIdx, MAC_ADDR_ARRAY(macAddr));
limReleasePreAuthNode(pMac, pTempNode);
return;
diff --git a/CORE/MAC/src/pe/lim/limSendManagementFrames.c b/CORE/MAC/src/pe/lim/limSendManagementFrames.c
index c4a6fe0..11578ce 100644
--- a/CORE/MAC/src/pe/lim/limSendManagementFrames.c
+++ b/CORE/MAC/src/pe/lim/limSendManagementFrames.c
@@ -1673,16 +1673,16 @@
if (subType == LIM_ASSOC)
{
- PELOG1(limLog(pMac, LOG1,
+ limLog(pMac, LOG1,
FL("*** Sending Assoc Resp status %d aid %d to "),
- statusCode, aid);)
+ statusCode, aid);
}
else{
- PELOG1(limLog(pMac, LOG1,
+ limLog(pMac, LOG1,
FL("*** Sending ReAssoc Resp status %d aid %d to "),
- statusCode, aid);)
+ statusCode, aid);
}
- PELOG1(limPrintMacAddr(pMac, pMacHdr->da, LOG1);)
+ limPrintMacAddr(pMac, pMacHdr->da, LOG1);
if ( addnIEPresent )
{
@@ -1975,9 +1975,9 @@
}
}
- PELOG1(limLog( pMac, LOG1, FL("Sending an Add TS Response (status %d) to "),
+ limLog( pMac, LOG1, FL("Sending an Add TS Response (status %d) to "),
nStatusCode );
- limPrintMacAddr( pMac, pMacHdr->da, LOG1 );)
+ limPrintMacAddr( pMac, pMacHdr->da, LOG1 );
if( ( SIR_BAND_5_GHZ == limGetRFBand(psessionEntry->currentOperChannel))
|| ( psessionEntry->pePersona == VOS_P2P_CLIENT_MODE ) ||
@@ -2165,8 +2165,8 @@
}
}
- PELOG1(limLog(pMac, LOG1, FL("Sending DELTS REQ (size %d) to "), nBytes);
- limPrintMacAddr(pMac, pMacHdr->da, LOG1);)
+ limLog(pMac, LOG1, FL("Sending DELTS REQ (size %d) to "), nBytes);
+ limPrintMacAddr(pMac, pMacHdr->da, LOG1);
if( ( SIR_BAND_5_GHZ == limGetRFBand(psessionEntry->currentOperChannel))
|| ( psessionEntry->pePersona == VOS_P2P_CLIENT_MODE ) ||
@@ -3648,11 +3648,11 @@
{
vos_mem_copy(pBody, (tANI_U8 *) pAuthFrameBody, bodyLen);
- PELOG1(limLog(pMac, LOG1,
+ limLog(pMac, LOG1,
FL("*** Sending Auth seq# 3 status %d (%d) to"MAC_ADDRESS_STR),
pAuthFrameBody->authStatusCode,
(pAuthFrameBody->authStatusCode == eSIR_MAC_SUCCESS_STATUS),
- MAC_ADDR_ARRAY(pMacHdr->da));)
+ MAC_ADDR_ARRAY(pMacHdr->da));
}
else
@@ -3711,12 +3711,12 @@
}
#endif
- PELOG1(limLog(pMac, LOG1,
+ limLog(pMac, LOG1,
FL("*** Sending Auth seq# %d status %d (%d) to "MAC_ADDRESS_STR),
pAuthFrameBody->authTransactionSeqNumber,
pAuthFrameBody->authStatusCode,
(pAuthFrameBody->authStatusCode == eSIR_MAC_SUCCESS_STATUS),
- MAC_ADDR_ARRAY(pMacHdr->da));)
+ MAC_ADDR_ARRAY(pMacHdr->da));
}
PELOG2(sirDumpBuf(pMac, SIR_LIM_MODULE_ID, LOG2, pFrame, frameLen);)
diff --git a/CORE/MAC/src/pe/lim/limSendSmeRspMessages.c b/CORE/MAC/src/pe/lim/limSendSmeRspMessages.c
index 7fb6c71..fc521ce 100644
--- a/CORE/MAC/src/pe/lim/limSendSmeRspMessages.c
+++ b/CORE/MAC/src/pe/lim/limSendSmeRspMessages.c
@@ -310,9 +310,9 @@
limDiagEventReport(pMac, WLAN_PE_DIAG_JOIN_RSP_EVENT, psessionEntry, (tANI_U16)resultCode, 0);
#endif //FEATURE_WLAN_DIAG_SUPPORT
- PELOG1(limLog(pMac, LOG1,
+ limLog(pMac, LOG1,
FL("Sending message %s with reasonCode %s"),
- limMsgStr(msgType), limResultCodeStr(resultCode));)
+ limMsgStr(msgType), limResultCodeStr(resultCode));
if(psessionEntry == NULL)
{
@@ -563,8 +563,8 @@
tANI_U16 ieLen;
tANI_U16 ieOffset, curLen;
- PELOG1(limLog(pMac, LOG1, FL("Sending message %s with reasonCode %s"),
- limMsgStr(msgType), limResultCodeStr(resultCode));)
+ limLog(pMac, LOG1, FL("Sending message %s with reasonCode %s"),
+ limMsgStr(msgType), limResultCodeStr(resultCode));
size = sizeof(tSirSmeStartBssRsp);
@@ -714,9 +714,9 @@
tANI_U8 *pbBuf;
tSirBssDescription *pDesc;
- PELOG1(limLog(pMac, LOG1,
+ limLog(pMac, LOG1,
FL("Sending message SME_SCAN_RSP with length=%d reasonCode %s"),
- length, limResultCodeStr(resultCode));)
+ length, limResultCodeStr(resultCode));
if (resultCode != eSIR_SME_SUCCESS)
{
@@ -1025,9 +1025,9 @@
tpSirSmeScanRsp pSirSmeScanRsp;
tSirMsgQ mmhMsg;
- PELOG1(limLog(pMac, LOG1,
+ limLog(pMac, LOG1,
FL("limPostSmeScanRspMessage: send SME_SCAN_RSP (len %d, reasonCode %s). "),
- length, limResultCodeStr(resultCode));)
+ length, limResultCodeStr(resultCode));
pSirSmeScanRsp = vos_mem_malloc(length);
if ( NULL == pSirSmeScanRsp )
@@ -2681,7 +2681,7 @@
mmhMsg.bodyptr = pExitBmpsInd;
mmhMsg.bodyval = 0;
- PELOG1(limLog(pMac, LOG1, FL("Sending eWNI_PMC_EXIT_BMPS_IND to SME. "));)
+ limLog(pMac, LOG1, FL("Sending eWNI_PMC_EXIT_BMPS_IND to SME. "));
MTRACE(macTraceMsgTx(pMac, NO_SESSION, mmhMsg.type));
#ifdef FEATURE_WLAN_DIAG_SUPPORT_LIM //FEATURE_WLAN_DIAG_SUPPORT
limDiagEventReport(pMac, WLAN_PE_DIAG_EXIT_BMPS_IND_EVENT, peGetValidPowerSaveSession(pMac), 0, (tANI_U16)reasonCode);
@@ -2823,8 +2823,8 @@
pSmeMaxAssocInd->sessionId = smesessionId;
mmhMsg.type = pSmeMaxAssocInd->mesgType;
mmhMsg.bodyptr = pSmeMaxAssocInd;
- PELOG1(limLog(pMac, LOG1, FL("msgType %s peerMacAddr "MAC_ADDRESS_STR
- " sme session id %d"), "eWNI_SME_MAX_ASSOC_EXCEEDED", MAC_ADDR_ARRAY(peerMacAddr));)
+ limLog(pMac, LOG1, FL("msgType %s peerMacAddr "MAC_ADDRESS_STR
+ " sme session id %d"), "eWNI_SME_MAX_ASSOC_EXCEEDED", MAC_ADDR_ARRAY(peerMacAddr),smesessionId);
MTRACE(macTraceMsgTx(pMac, smesessionId, mmhMsg.type));
limSysProcessMmhMsgApi(pMac, &mmhMsg, ePROT);
diff --git a/CORE/MAC/src/pe/lim/limTimerUtils.c b/CORE/MAC/src/pe/lim/limTimerUtils.c
index 5dd4a1e..bac004f 100644
--- a/CORE/MAC/src/pe/lim/limTimerUtils.c
+++ b/CORE/MAC/src/pe/lim/limTimerUtils.c
@@ -2241,8 +2241,8 @@
tSirMsgQ msg;
tpAniSirGlobal pMac = (tpAniSirGlobal)pMacGlobal;
- PELOG1(limLog(pMac, LOG1,
- FL("ChannelSwitch Timer expired. Posting msg to LIM "));)
+ limLog(pMac, LOG1,
+ FL("ChannelSwitch Timer expired. Posting msg to LIM "));
msg.type = SIR_LIM_CHANNEL_SWITCH_TIMEOUT;
msg.bodyval = (tANI_U32)param;
@@ -2261,8 +2261,8 @@
msg.bodyval = (tANI_U32)param;
msg.bodyptr = NULL;
- PELOG1(limLog(pMac, LOG1,
- FL("Post SIR_LIM_QUIET_TIMEOUT msg. "));)
+ limLog(pMac, LOG1,
+ FL("Post SIR_LIM_QUIET_TIMEOUT msg. "));
limPostMsgApi(pMac, &msg);
}
@@ -2275,8 +2275,8 @@
msg.type = SIR_LIM_QUIET_BSS_TIMEOUT;
msg.bodyval = (tANI_U32)param;
msg.bodyptr = NULL;
- PELOG1(limLog(pMac, LOG1,
- FL("Post SIR_LIM_QUIET_BSS_TIMEOUT msg. "));)
+ limLog(pMac, LOG1,
+ FL("Post SIR_LIM_QUIET_BSS_TIMEOUT msg. "));
limPostMsgApi(pMac, &msg);
}
#if 0
diff --git a/CORE/MAC/src/pe/lim/limUtils.c b/CORE/MAC/src/pe/lim/limUtils.c
index 51ad522..a59176b 100644
--- a/CORE/MAC/src/pe/lim/limUtils.c
+++ b/CORE/MAC/src/pe/lim/limUtils.c
@@ -1915,7 +1915,7 @@
pStaDs = dphLookupHashEntry(pMac, peerMacAddr, &tmpAid, &psessionEntry->dph.dphHashTable);
if(NULL == pStaDs)
{
- PELOG1(limLog(pMac, LOG1, FL("pStaDs is NULL"));)
+ limLog(pMac, LOG1, FL("pStaDs is NULL"));
return;
}
limGetRfBand(pMac, &rfBand, psessionEntry);
@@ -2894,7 +2894,7 @@
return;
}
- PELOG1(limLog(pMac, LOG1, FL("quietState = %d"), psessionEntry->gLimSpecMgmt.quietState);)
+ limLog(pMac, LOG1, FL("quietState = %d"), psessionEntry->gLimSpecMgmt.quietState);
switch( psessionEntry->gLimSpecMgmt.quietState )
{
case eLIM_QUIET_BEGIN:
@@ -3015,7 +3015,7 @@
return;
}
- PELOG1(limLog(pMac, LOG1, FL("quietState = %d"), psessionEntry->gLimSpecMgmt.quietState);)
+ limLog(pMac, LOG1, FL("quietState = %d"), psessionEntry->gLimSpecMgmt.quietState);
if (eLIM_AP_ROLE == psessionEntry->limSystemRole)
{
}
@@ -5493,10 +5493,10 @@
tsinfo = pDeltsReq->req.wmeTspecPresent ? &pDeltsReq->req.tspec.tsinfo
: &pDeltsReq->req.tsinfo;
- PELOG1(limLog(pMac, LOG1,
+ limLog(pMac, LOG1,
FL("received DELTS_REQ message (wmeTspecPresent = %d, lleTspecPresent = %d, wsmTspecPresent = %d, tsid %d, up %d, direction = %d)"),
pDeltsReq->req.wmeTspecPresent, pDeltsReq->req.lleTspecPresent, pDeltsReq->req.wsmTspecPresent,
- tsinfo->traffic.tsid, tsinfo->traffic.userPrio, tsinfo->traffic.direction);)
+ tsinfo->traffic.tsid, tsinfo->traffic.userPrio, tsinfo->traffic.direction);
// if no Access Control, ignore the request
@@ -5867,9 +5867,9 @@
PELOGE(limLog(pMac, LOGE, FL("limValidateDeltsReq failed"));)
goto error2;
}
- PELOG1(limLog(pMac, LOG1, "Sent DELTS request to station with "
- "assocId = %d MacAddr = "MAC_ADDRESS_STR,
- pDelTsReq->aid, MAC_ADDR_ARRAY(peerMacAddr));)
+ limLog(pMac, LOG1, "Sent DELTS request to station with "
+ "assocId = %d MacAddr = "MAC_ADDRESS_STR,
+ pDelTsReq->aid, MAC_ADDR_ARRAY(peerMacAddr));
limSendDeltsReqActionFrame(pMac, peerMacAddr, pDelTsReq->req.wmeTspecPresent, &pDelTsReq->req.tsinfo, &pDelTsReq->req.tspec,
psessionEntry);
@@ -6731,11 +6731,11 @@
if (mode == eLIM_STOP_TX)
{
- PELOG1(limLog(pMac, LOG1, FL("Stopping the transmission of all packets, indicated softmac"));)
+ limLog(pMac, LOG1, FL("Stopping the transmission of all packets, indicated softmac"));
}
else
{
- PELOG1(limLog(pMac, LOG1, FL("Resuming the transmission of all packets, indicated softmac"));)
+ limLog(pMac, LOG1, FL("Resuming the transmission of all packets, indicated softmac"));
}
return;
}
@@ -7049,7 +7049,7 @@
tANI_U16 direction = pTsInfo->traffic.direction;
tANI_U8 ac = upToAc(userPrio);
- PELOG1(limLog(pMac, LOG1, FL(" Set UAPSD mask for AC %d, direction %d, action=%d (1=set,0=clear) "),ac, direction, action );)
+ limLog(pMac, LOG1, FL(" Set UAPSD mask for AC %d, direction %d, action=%d (1=set,0=clear) "),ac, direction, action );
/* Converting AC to appropriate Uapsd Bit Mask
* AC_BE(0) --> UAPSD_BITOFFSET_ACVO(3)