wlan: lim: fix logging format/argument mismatch
Source code analysis uncovered mismatches between format and argument
in invocations of logging APIs in the lim code, so fix them.
Change-Id: I4a8a9bc6fe0492e08fb7b81e1b231e14f80820d6
CRs-fixed: 570511
diff --git a/CORE/MAC/src/pe/lim/limAdmitControl.c b/CORE/MAC/src/pe/lim/limAdmitControl.c
index 584b5e8..3aa77df 100644
--- a/CORE/MAC/src/pe/lim/limAdmitControl.c
+++ b/CORE/MAC/src/pe/lim/limAdmitControl.c
@@ -569,7 +569,7 @@
return;
//pierre
limLog(pMac, ADMIT_CONTROL_LOGLEVEL, FL("tspec entry = %d"), pInfo->idx);
- limLog(pMac, ADMIT_CONTROL_LOGLEVEL, FL("delete tspec %08X"),pInfo);
+ limLog(pMac, ADMIT_CONTROL_LOGLEVEL, FL("delete tspec %p"), pInfo);
pInfo->inuse = 0;
// clear the hcca/parameterized queue indicator
diff --git a/CORE/MAC/src/pe/lim/limFT.c b/CORE/MAC/src/pe/lim/limFT.c
index 1155e58..78c2c30 100644
--- a/CORE/MAC/src/pe/lim/limFT.c
+++ b/CORE/MAC/src/pe/lim/limFT.c
@@ -324,13 +324,17 @@
// Only 11r assoc has FT IEs.
if (pMac->ft.ftPEContext.pFTPreAuthReq->ft_ies == NULL)
{
- PELOGE(limLog( pMac, LOGE, "%s: FTIEs for Auth Req Seq 1 is absent");)
+ PELOGE(limLog( pMac, LOGE,
+ "%s: FTIEs for Auth Req Seq 1 is absent",
+ __func__);)
return;
}
}
if (status != eHAL_STATUS_SUCCESS)
{
- PELOGE(limLog( pMac, LOGE, "%s: Change channel not successful for FT pre-auth");)
+ PELOGE(limLog( pMac, LOGE,
+ "%s: Change channel not successful for FT pre-auth",
+ __func__);)
return;
}
pMac->ft.ftPEContext.psavedsessionEntry = psessionEntry;
@@ -925,7 +929,7 @@
}
vos_mem_zero( pFTPreAuthRsp, rspLen);
#if defined WLAN_FEATURE_VOWIFI_11R_DEBUG
- PELOGE(limLog( pMac, LOG1, "%s: Auth Rsp = %p", pFTPreAuthRsp);)
+ PELOGE(limLog( pMac, LOG1, FL("Auth Rsp = %p"), pFTPreAuthRsp);)
#endif
vos_mem_set((tANI_U8*)pFTPreAuthRsp, rspLen, 0);
diff --git a/CORE/MAC/src/pe/lim/limP2P.c b/CORE/MAC/src/pe/lim/limP2P.c
index ed5ccaf..5499d8b 100644
--- a/CORE/MAC/src/pe/lim/limP2P.c
+++ b/CORE/MAC/src/pe/lim/limP2P.c
@@ -345,7 +345,7 @@
if (status != eHAL_STATUS_SUCCESS)
{
- limLog( pMac, LOGE, "%s: Change channel not successful");
+ limLog( pMac, LOGE, FL("Change channel not successful"));
goto error1;
}
@@ -959,7 +959,7 @@
}
nBytes += noaLen;
limLog( pMac, LOGE,
- FL("noaLen=%d origLen=%d pP2PIe=0x%x"
+ FL("noaLen=%d origLen=%d pP2PIe=%p"
" nBytes=%d nBytesToCopy=%d "),
noaLen,origLen,pP2PIe,nBytes,
((pP2PIe + origLen + 2) - (v_U8_t *)pMbMsg->data));
@@ -1088,7 +1088,7 @@
else
{
pMac->lim.mgmtFrameSessionId = pMbMsg->sessionId;
- limLog( pMac, LOG2, FL("lim.actionFrameSessionId = %lu" ),
+ limLog( pMac, LOG2, FL("lim.actionFrameSessionId = %u" ),
pMac->lim.mgmtFrameSessionId);
}
diff --git a/CORE/MAC/src/pe/lim/limProcessAssocReqFrame.c b/CORE/MAC/src/pe/lim/limProcessAssocReqFrame.c
index 08d6cc1..56a6134 100644
--- a/CORE/MAC/src/pe/lim/limProcessAssocReqFrame.c
+++ b/CORE/MAC/src/pe/lim/limProcessAssocReqFrame.c
@@ -322,7 +322,7 @@
pHdr->sa,
subType, 0,psessionEntry);
- limLog(pMac, LOGW, FL("local caps 0x%x received 0x%x"), localCapabilities, pAssocReq->capabilityInfo);
+ limLog(pMac, LOGW, FL("local caps mismatch received caps"));
// Log error
if (subType == LIM_ASSOC)
diff --git a/CORE/MAC/src/pe/lim/limProcessCfgUpdates.c b/CORE/MAC/src/pe/lim/limProcessCfgUpdates.c
index 2401378..220d0a7 100644
--- a/CORE/MAC/src/pe/lim/limProcessCfgUpdates.c
+++ b/CORE/MAC/src/pe/lim/limProcessCfgUpdates.c
@@ -381,7 +381,7 @@
status = limPostMsgApi(pMac, &msg);
if (status != TX_SUCCESS)
- PELOGE(limLog(pMac, LOGE, FL("Failed limPostMsgApi"), status);)
+ PELOGE(limLog(pMac, LOGE, FL("Failed limPostMsgApi %u"), status);)
break;
}
case WNI_CFG_GREENFIELD_CAPABILITY:
diff --git a/CORE/MAC/src/pe/lim/limProcessDisassocFrame.c b/CORE/MAC/src/pe/lim/limProcessDisassocFrame.c
index d78c25e..e76dcf3 100644
--- a/CORE/MAC/src/pe/lim/limProcessDisassocFrame.c
+++ b/CORE/MAC/src/pe/lim/limProcessDisassocFrame.c
@@ -228,8 +228,7 @@
{
limLog(pMac, LOGW,
FL("Ignoring disassoc frame due to upcoming "
- "channel switch, from"),
- reasonCode);
+ "channel switch, from"));
limPrintMacAddr(pMac, pHdr->sa, LOGW);
return;
}
diff --git a/CORE/MAC/src/pe/lim/limProcessMessageQueue.c b/CORE/MAC/src/pe/lim/limProcessMessageQueue.c
index eb3cc0b..3052641 100644
--- a/CORE/MAC/src/pe/lim/limProcessMessageQueue.c
+++ b/CORE/MAC/src/pe/lim/limProcessMessageQueue.c
@@ -864,8 +864,7 @@
rc = wdaPostCtrlMsg(pMac, &msg);
if (rc != eSIR_SUCCESS)
{
- limLog(pMac, LOGE, FL("wdaPostCtrlMsg() return failure"),
- pMac);
+ limLog(pMac, LOGE, FL("wdaPostCtrlMsg() return failure"));
palFreeMemory(pMac->hHdd, (tANI_U8 *)pAbortScanParams);
return eHAL_STATUS_FAILURE;
}
diff --git a/CORE/MAC/src/pe/lim/limProcessMlmReqMessages.c b/CORE/MAC/src/pe/lim/limProcessMlmReqMessages.c
index 7dff7c5..78b7161 100644
--- a/CORE/MAC/src/pe/lim/limProcessMlmReqMessages.c
+++ b/CORE/MAC/src/pe/lim/limProcessMlmReqMessages.c
@@ -4460,7 +4460,7 @@
if ( NULL == pMlmAddBACnf )
{
limLog( pMac, LOGP,
- FL("AllocateMemory failed with error code %d"));
+ FL("AllocateMemory failed"));
vos_mem_free(pMsgBuf);
return;
}
diff --git a/CORE/MAC/src/pe/lim/limProcessMlmRspMessages.c b/CORE/MAC/src/pe/lim/limProcessMlmRspMessages.c
index 7a795c0..888f80e 100644
--- a/CORE/MAC/src/pe/lim/limProcessMlmRspMessages.c
+++ b/CORE/MAC/src/pe/lim/limProcessMlmRspMessages.c
@@ -1989,8 +1989,7 @@
if ( eSIR_SUCCESS != limSendExcludeUnencryptInd(pMac, TRUE, psessionEntry) )
{
limLog( pMac, LOGE,
- FL( "Could not send down Exclude Unencrypted Indication!" ),
- psessionEntry->limMlmState );
+ FL( "Could not send down Exclude Unencrypted Indication!" ) );
}
}
#endif
@@ -3147,8 +3146,7 @@
if ( eSIR_SUCCESS != limSendExcludeUnencryptInd(pMac, FALSE, psessionEntry) )
{
limLog( pMac, LOGE,
- FL( "Could not send down Exclude Unencrypted Indication!" ),
- psessionEntry->limMlmState );
+ FL( "Could not send down Exclude Unencrypted Indication!" ) );
}
}
#endif
@@ -4022,7 +4020,7 @@
// Allocate for LIM_MLM_ADDBA_CNF
pMlmAddBACnf = vos_mem_malloc(sizeof(tLimMlmAddBACnf));
if ( NULL == pMlmAddBACnf ) {
- limLog( pMac, LOGP, FL(" AllocateMemory failed with error code %d"));
+ limLog( pMac, LOGP, FL(" AllocateMemory failed for pMlmAddBACnf"));
vos_mem_free(limMsgQ->bodyptr);
return;
}
@@ -4809,7 +4807,7 @@
tSirScanOffloadEvent *pScanEvent = (tSirScanOffloadEvent *) buf;
VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_INFO,
- "scan_id = %lu", pScanEvent->scanId);
+ "scan_id = %u", pScanEvent->scanId);
switch (pScanEvent->event)
{
@@ -4825,6 +4823,6 @@
case SCAN_EVENT_PREEMPTED:
default:
VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_DEBUG,
- "Received unhandled scan event %lu", pScanEvent->event);
+ "Received unhandled scan event %u", pScanEvent->event);
}
}
diff --git a/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c b/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c
index fd66b68..03e76af 100644
--- a/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c
+++ b/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c
@@ -771,7 +771,7 @@
centerChan = limGetCenterChannel(pMac,channelNumber,pSmeStartBssReq->cbMode,WNI_CFG_VHT_CHANNEL_WIDTH_80MHZ);
if(centerChan != eSIR_CFG_INVALID_ID)
{
- limLog(pMac, LOGW, FL("***Center Channel for 80MHZ channel width = %ld"),centerChan);
+ limLog(pMac, LOGW, FL("***Center Channel for 80MHZ channel width = %d"),centerChan);
psessionEntry->apCenterChan = centerChan;
if (cfgSetInt(pMac, WNI_CFG_VHT_CHANNEL_CENTER_FREQ_SEGMENT1, centerChan)
!= eSIR_SUCCESS)
@@ -1141,8 +1141,7 @@
rc = wdaPostCtrlMsg(pMac, &msg);
if (rc != eSIR_SUCCESS)
{
- limLog(pMac, LOGE, FL("wdaPostCtrlMsg() return failure"),
- pMac);
+ limLog(pMac, LOGE, FL("wdaPostCtrlMsg() return failure"));
vos_mem_free(pScanOffloadReq);
return eHAL_STATUS_FAILURE;
}
diff --git a/CORE/MAC/src/pe/lim/limProcessTdls.c b/CORE/MAC/src/pe/lim/limProcessTdls.c
index 6a421fc..b23a665 100644
--- a/CORE/MAC/src/pe/lim/limProcessTdls.c
+++ b/CORE/MAC/src/pe/lim/limProcessTdls.c
@@ -295,7 +295,7 @@
else
pMac->lim.gLimTdlsNegativeBehavior &= ~(1 << (value-1));
}
- LIM_LOG_TDLS(VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_ERROR,("%d %d -> gLimTdlsNegativeBehavior= 0x%lx"), \
+ LIM_LOG_TDLS(VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_ERROR,("%d %d -> gLimTdlsNegativeBehavior= 0x%lx"),
value, on, pMac->lim.gLimTdlsNegativeBehavior));
}
#endif
@@ -341,10 +341,10 @@
vos_mem_copy( (tANI_U8 *) pMacHdr->bssId,
bssid, sizeof( tSirMacAddr ));
- LIM_LOG_TDLS(VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_WARN, ("Preparing TDLS action frame\n%02x:%02x:%02x:%02x:%02x:%02x/%02x:%02x:%02x:%02x:%02x:%02x/%02x:%02x:%02x:%02x:%02x:%02x"), \
- pMacHdr->da[0], pMacHdr->da[1], pMacHdr->da[2], pMacHdr->da[3], pMacHdr->da[4], pMacHdr->da[5], \
- pMacHdr->sa[0], pMacHdr->sa[1], pMacHdr->sa[2], pMacHdr->sa[3], pMacHdr->sa[4], pMacHdr->sa[5], \
- pMacHdr->bssId[0], pMacHdr->bssId[1], pMacHdr->bssId[2], \
+ LIM_LOG_TDLS(VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_WARN, ("Preparing TDLS action frame\n%02x:%02x:%02x:%02x:%02x:%02x/%02x:%02x:%02x:%02x:%02x:%02x/%02x:%02x:%02x:%02x:%02x:%02x"),
+ pMacHdr->da[0], pMacHdr->da[1], pMacHdr->da[2], pMacHdr->da[3], pMacHdr->da[4], pMacHdr->da[5],
+ pMacHdr->sa[0], pMacHdr->sa[1], pMacHdr->sa[2], pMacHdr->sa[3], pMacHdr->sa[4], pMacHdr->sa[5],
+ pMacHdr->bssId[0], pMacHdr->bssId[1], pMacHdr->bssId[2],
pMacHdr->bssId[3], pMacHdr->bssId[4], pMacHdr->bssId[5]));
return ;
@@ -408,10 +408,10 @@
(tANI_U8 *) (addr3),
sizeof( tSirMacAddr ));
- LIM_LOG_TDLS(VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_WARN, ("Preparing TDLS frame header to %s\n%02x:%02x:%02x:%02x:%02x:%02x/%02x:%02x:%02x:%02x:%02x:%02x/%02x:%02x:%02x:%02x:%02x:%02x"), \
- (tdlsLinkType == TDLS_LINK_AP) ? "AP" : "TD", \
- pMacHdr->addr1[0], pMacHdr->addr1[1], pMacHdr->addr1[2], pMacHdr->addr1[3], pMacHdr->addr1[4], pMacHdr->addr1[5], \
- pMacHdr->addr2[0], pMacHdr->addr2[1], pMacHdr->addr2[2], pMacHdr->addr2[3], pMacHdr->addr2[4], pMacHdr->addr2[5], \
+ LIM_LOG_TDLS(VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_WARN, ("Preparing TDLS frame header to %s\n%02x:%02x:%02x:%02x:%02x:%02x/%02x:%02x:%02x:%02x:%02x:%02x/%02x:%02x:%02x:%02x:%02x:%02x"),
+ (tdlsLinkType == TDLS_LINK_AP) ? "AP" : "TD",
+ pMacHdr->addr1[0], pMacHdr->addr1[1], pMacHdr->addr1[2], pMacHdr->addr1[3], pMacHdr->addr1[4], pMacHdr->addr1[5],
+ pMacHdr->addr2[0], pMacHdr->addr2[1], pMacHdr->addr2[2], pMacHdr->addr2[3], pMacHdr->addr2[4], pMacHdr->addr2[5],
pMacHdr->addr3[0], pMacHdr->addr3[1], pMacHdr->addr3[2], pMacHdr->addr3[3], pMacHdr->addr3[4], pMacHdr->addr3[5]));
//printMacAddr(pMacHdr->bssId) ;
@@ -517,7 +517,7 @@
}
else if ( DOT11F_WARNED( status ) )
{
- limLog( pMac, LOGW, FL("There were warnings while calculating"
+ limLog( pMac, LOGW, FL("There were warnings while calculating "
"the packed size for a discovery Request ("
"0x%08x)."), status );
}
@@ -582,7 +582,7 @@
tdlsDisReq.LinkIdentifier.bssid[4] = 0xde;
tdlsDisReq.LinkIdentifier.bssid[5] = 0xad;
VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_ERROR,
- ("TDLS negative running: wrong BSSID %02x:%02x:%02x:%02x:%02x:%02x in TDLS Discovery Req"), \
+ ("TDLS negative running: wrong BSSID %02x:%02x:%02x:%02x:%02x:%02x in TDLS Discovery Req"),
tdlsDisReq.LinkIdentifier.bssid[0],
tdlsDisReq.LinkIdentifier.bssid[1],
tdlsDisReq.LinkIdentifier.bssid[2],
@@ -596,16 +596,16 @@
if ( DOT11F_FAILED( status ) )
{
- limLog( pMac, LOGE, FL("Failed to pack a TDLS discovery req \
- (0x%08x)."), status );
+ limLog( pMac, LOGE, FL("Failed to pack a TDLS discovery req "
+ "(0x%08x)."), status );
palPktFree( pMac->hHdd, HAL_TXRX_FRM_802_11_MGMT,
( void* ) pFrame, ( void* ) pPacket );
return eSIR_FAILURE;
}
else if ( DOT11F_WARNED( status ) )
{
- limLog( pMac, LOGW, FL("There were warnings while packing TDLS"
- "Discovery Request (0x%08x).") );
+ limLog( pMac, LOGW, FL("There were warnings while packing TDLS "
+ "Discovery Request (0x%08x)."), status );
}
#ifndef NO_PAD_TDLS_MIN_8023_SIZE
@@ -1042,7 +1042,7 @@
}
else if ( DOT11F_WARNED( status ) )
{
- limLog( pMac, LOGW, FL("There were warnings while calculating"
+ limLog( pMac, LOGW, FL("There were warnings while calculating "
"the packed size for a discovery Request ("
"0x%08x)."), status );
}
@@ -1100,7 +1100,7 @@
tdlsDisRsp.LinkIdentifier.bssid[4] = 0xde;
tdlsDisRsp.LinkIdentifier.bssid[5] = 0xad;
VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_ERROR,
- ("TDLS negative running: wrong BSSID %02x:%02x:%02x:%02x:%02x:%02x in TDLS Discovery Rsp"), \
+ ("TDLS negative running: wrong BSSID %02x:%02x:%02x:%02x:%02x:%02x in TDLS Discovery Rsp"),
tdlsDisRsp.LinkIdentifier.bssid[0],
tdlsDisRsp.LinkIdentifier.bssid[1],
tdlsDisRsp.LinkIdentifier.bssid[2],
@@ -1115,16 +1115,16 @@
if ( DOT11F_FAILED( status ) )
{
- limLog( pMac, LOGE, FL("Failed to pack a TDLS discovery req \
- (0x%08x)."), status );
+ limLog( pMac, LOGE, FL("Failed to pack a TDLS discovery req "
+ "(0x%08x)."), status );
palPktFree( pMac->hHdd, HAL_TXRX_FRM_802_11_MGMT,
( void* ) pFrame, ( void* ) pPacket );
return eSIR_FAILURE;
}
else if ( DOT11F_WARNED( status ) )
{
- limLog( pMac, LOGW, FL("There were warnings while packing TDLS"
- "Discovery Request (0x%08x).") );
+ limLog( pMac, LOGW, FL("There were warnings while packing TDLS "
+ "Discovery Request (0x%08x)."), status );
}
#if 0
@@ -1330,7 +1330,7 @@
}
else if ( DOT11F_WARNED( status ) )
{
- limLog( pMac, LOGW, FL("There were warnings while calculating"
+ limLog( pMac, LOGW, FL("There were warnings while calculating "
"the packed size for a discovery Request ("
"0x%08x)."), status );
}
@@ -1380,7 +1380,7 @@
tdlsSetupReq.LinkIdentifier.bssid[4] = 0xde;
tdlsSetupReq.LinkIdentifier.bssid[5] = 0xad;
VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_ERROR,
- ("TDLS negative running: wrong BSSID %02x:%02x:%02x:%02x:%02x:%02x in TDLS Setup Req"), \
+ ("TDLS negative running: wrong BSSID %02x:%02x:%02x:%02x:%02x:%02x in TDLS Setup Req"),
tdlsSetupReq.LinkIdentifier.bssid[0],
tdlsSetupReq.LinkIdentifier.bssid[1],
tdlsSetupReq.LinkIdentifier.bssid[2],
@@ -1398,16 +1398,16 @@
if ( DOT11F_FAILED( status ) )
{
- limLog( pMac, LOGE, FL("Failed to pack a TDLS discovery req \
- (0x%08x)."), status );
+ limLog( pMac, LOGE, FL("Failed to pack a TDLS discovery req "
+ "(0x%08x)."), status );
palPktFree( pMac->hHdd, HAL_TXRX_FRM_802_11_MGMT,
( void* ) pFrame, ( void* ) pPacket );
return eSIR_FAILURE;
}
else if ( DOT11F_WARNED( status ) )
{
- limLog( pMac, LOGW, FL("There were warnings while packing TDLS"
- "Discovery Request (0x%08x).") );
+ limLog( pMac, LOGW, FL("There were warnings while packing TDLS "
+ "Discovery Request (0x%08x)."), status );
}
//Copy the additional IE.
@@ -1489,7 +1489,7 @@
}
else if ( DOT11F_WARNED( status ) )
{
- limLog( pMac, LOGW, FL("There were warnings while calculating"
+ limLog( pMac, LOGW, FL("There were warnings while calculating "
"the packed size for a discovery Request ("
"0x%08x)."), status );
}
@@ -1559,16 +1559,16 @@
if ( DOT11F_FAILED( status ) )
{
- limLog( pMac, LOGE, FL("Failed to pack a TDLS Teardown req \
- (0x%08x)."), status );
+ limLog( pMac, LOGE, FL("Failed to pack a TDLS Teardown req (0x%08x)."),
+ status );
palPktFree( pMac->hHdd, HAL_TXRX_FRM_802_11_MGMT,
( void* ) pFrame, ( void* ) pPacket );
return eSIR_FAILURE;
}
else if ( DOT11F_WARNED( status ) )
{
- limLog( pMac, LOGW, FL("There were warnings while packing TDLS"
- "Teardown Request (0x%08x).") );
+ limLog( pMac, LOGW, FL("There were warnings while packing TDLS "
+ "Teardown Request (0x%08x)."), status );
}
#if 0
if(pMac->hal.pCBackFnTxComp == NULL)
@@ -1797,7 +1797,7 @@
}
else if ( DOT11F_WARNED( status ) )
{
- limLog( pMac, LOGW, FL("There were warnings while calculating"
+ limLog( pMac, LOGW, FL("There were warnings while calculating "
"the packed size for a discovery Request ("
"0x%08x)."), status );
}
@@ -1848,7 +1848,7 @@
tdlsSetupRsp.LinkIdentifier.bssid[4] = 0xde;
tdlsSetupRsp.LinkIdentifier.bssid[5] = 0xad;
VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_ERROR,
- ("TDLS negative running: wrong BSSID %02x:%02x:%02x:%02x:%02x:%02x in TDLS Setup Rsp"), \
+ ("TDLS negative running: wrong BSSID %02x:%02x:%02x:%02x:%02x:%02x in TDLS Setup Rsp"),
tdlsSetupRsp.LinkIdentifier.bssid[0],
tdlsSetupRsp.LinkIdentifier.bssid[1],
tdlsSetupRsp.LinkIdentifier.bssid[2],
@@ -1865,16 +1865,16 @@
if ( DOT11F_FAILED( status ) )
{
- limLog( pMac, LOGE, FL("Failed to pack a TDLS discovery req \
- (0x%08x)."), status );
+ limLog( pMac, LOGE, FL("Failed to pack a TDLS discovery req "
+ "(0x%08x)."), status );
palPktFree( pMac->hHdd, HAL_TXRX_FRM_802_11_MGMT,
( void* ) pFrame, ( void* ) pPacket );
return eSIR_FAILURE;
}
else if ( DOT11F_WARNED( status ) )
{
- limLog( pMac, LOGW, FL("There were warnings while packing TDLS"
- "Discovery Request (0x%08x).") );
+ limLog( pMac, LOGW, FL("There were warnings while packing TDLS "
+ "Discovery Request (0x%08x)."), status );
}
//Copy the additional IE.
@@ -1982,7 +1982,7 @@
}
else if ( DOT11F_WARNED( status ) )
{
- limLog( pMac, LOGW, FL("There were warnings while calculating"
+ limLog( pMac, LOGW, FL("There were warnings while calculating "
"the packed size for a discovery Request ("
"0x%08x)."), status );
}
@@ -2056,16 +2056,16 @@
if ( DOT11F_FAILED( status ) )
{
- limLog( pMac, LOGE, FL("Failed to pack a TDLS discovery req \
- (0x%08x)."), status );
+ limLog( pMac, LOGE, FL("Failed to pack a TDLS discovery req "
+ "(0x%08x)."), status );
palPktFree( pMac->hHdd, HAL_TXRX_FRM_802_11_MGMT,
( void* ) pFrame, ( void* ) pPacket );
return eSIR_FAILURE;
}
else if ( DOT11F_WARNED( status ) )
{
- limLog( pMac, LOGW, FL("There were warnings while packing TDLS"
- "Discovery Request (0x%08x).") );
+ limLog( pMac, LOGW, FL("There were warnings while packing TDLS "
+ "Discovery Request (0x%08x)."), status );
}
#if 0
if(pMac->hal.pCBackFnTxComp == NULL)
@@ -2231,10 +2231,10 @@
{
ConvertQOSCapsStation(pMac->hHdd, &setupPeer->qosCaps,
&setupReq->QOSCapsStation) ;
- LIM_LOG_TDLS(VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_ERROR,("setupReq->SPLen=%d (be %d %d %d %d vo) more %d qack %d."), \
- setupReq->QOSCapsStation.max_sp_length, setupReq->QOSCapsStation.acbe_uapsd, \
- setupReq->QOSCapsStation.acbk_uapsd, setupReq->QOSCapsStation.acvi_uapsd, \
- setupReq->QOSCapsStation.acvo_uapsd, setupReq->QOSCapsStation.more_data_ack, \
+ LIM_LOG_TDLS(VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_ERROR,("setupReq->SPLen=%d (be %d %d %d %d vo) more %d qack %d."),
+ setupReq->QOSCapsStation.max_sp_length, setupReq->QOSCapsStation.acbe_uapsd,
+ setupReq->QOSCapsStation.acbk_uapsd, setupReq->QOSCapsStation.acvi_uapsd,
+ setupReq->QOSCapsStation.acvo_uapsd, setupReq->QOSCapsStation.more_data_ack,
setupReq->QOSCapsStation.qack));
}
@@ -2282,10 +2282,10 @@
{
ConvertQOSCapsStation(pMac->hHdd, &setupPeer->qosCaps,
&setupRsp->QOSCapsStation) ;
- LIM_LOG_TDLS(VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_ERROR, ("setupRsp->SPLen=%d (be %d %d %d %d vo) more %d qack %d."), \
- setupRsp->QOSCapsStation.max_sp_length, setupRsp->QOSCapsStation.acbe_uapsd, \
- setupRsp->QOSCapsStation.acbk_uapsd, setupRsp->QOSCapsStation.acvi_uapsd, \
- setupRsp->QOSCapsStation.acvo_uapsd, setupRsp->QOSCapsStation.more_data_ack, \
+ LIM_LOG_TDLS(VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_ERROR, ("setupRsp->SPLen=%d (be %d %d %d %d vo) more %d qack %d."),
+ setupRsp->QOSCapsStation.max_sp_length, setupRsp->QOSCapsStation.acbe_uapsd,
+ setupRsp->QOSCapsStation.acbk_uapsd, setupRsp->QOSCapsStation.acvi_uapsd,
+ setupRsp->QOSCapsStation.acvo_uapsd, setupRsp->QOSCapsStation.more_data_ack,
setupRsp->QOSCapsStation.qack));
}
@@ -3024,15 +3024,15 @@
if ( DOT11F_FAILED( status ) )
{
- limLog(pMac, LOGE, FL("Failed to parse TDLS discovery Request \
- frame (0x%08x, %d bytes):"),status, frmLen);
+ limLog(pMac, LOGE, FL("Failed to parse TDLS discovery Request "
+ "frame (0x%08x, %d bytes):"),status, frmLen);
PELOG2(sirDumpBuf(pMac, SIR_DBG_MODULE_ID, LOG2, pBody, frmLen);)
return eSIR_FAILURE;
}
else if ( DOT11F_WARNED( status ) )
{
- limLog( pMac, LOGW, FL("There were warnings while unpacking an\
- TDLS discovery Request frame (0x%08x," "%d bytes):"),
+ limLog( pMac, LOGW, FL("There were warnings while unpacking a TDLS "
+ "discovery Request frame (0x%08x, %d bytes):"),
status, frmLen );
PELOG2(sirDumpBuf(pMac, SIR_DBG_MODULE_ID, LOG2, pBody, frmLen);)
}
@@ -3046,8 +3046,8 @@
&tdlsDisReq.LinkIdentifier.bssid[0], &sessionId) ;
if(NULL == psessionEntry)
{
- VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_ERROR, \
- ("no Seesion entry for TDLS session (bssid %02x:%02x:%02x:%02x:%02x:%02x)"), \
+ VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_ERROR,
+ ("no Seesion entry for TDLS session (bssid %02x:%02x:%02x:%02x:%02x:%02x)"),
tdlsDisReq.LinkIdentifier.bssid[0],
tdlsDisReq.LinkIdentifier.bssid[1],
tdlsDisReq.LinkIdentifier.bssid[2],
@@ -3124,8 +3124,8 @@
tdlsDisResult = vos_mem_malloc(sizeof(tLimDisResultList));
if ( NULL == tdlsDisResult )
{
- limLog(pMac, LOGP, FL("alloc fail for TDLS discovery \
- reponse info")) ;
+ limLog(pMac, LOGP, FL("alloc fail for TDLS discovery "
+ "reponse info")) ;
return eSIR_FAILURE ;
}
@@ -3246,16 +3246,16 @@
if ( DOT11F_FAILED( status ) )
{
- limLog(pMac, LOGE, FL("Failed to parse TDLS discovery Request \
- frame (0x%08x, %d bytes):"),status, frmLen);
+ limLog(pMac, LOGE, FL("Failed to parse TDLS discovery Request "
+ "frame (0x%08x, %d bytes):"),status, frmLen);
PELOG2(sirDumpBuf(pMac, SIR_DBG_MODULE_ID, LOG2, pBody, frmLen);)
return eSIR_FAILURE;
}
else if ( DOT11F_WARNED( status ) )
{
- limLog( pMac, LOGW, FL("There were warnings while unpacking an\
- TDLS setup Request frame (0x%08x," "%d bytes):"),
- status, pBody );
+ limLog( pMac, LOGW, FL("There were warnings while unpacking a TDLS "
+ "setup Request frame (0x%08x, %d bytes):"),
+ status, frmLen );
PELOG2(sirDumpBuf(pMac, SIR_DBG_MODULE_ID, LOG2, pBody, frmLen);)
}
/*
@@ -3267,8 +3267,8 @@
&tdlsSetupReq.LinkIdentifier.bssid[0], &sessionId) ;
if(NULL == psessionEntry)
{
- VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_ERROR, \
- ("no Seesion entry for TDLS session (bssid %02x:%02x:%02x:%02x:%02x:%02x)"), \
+ VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_ERROR,
+ ("no Seesion entry for TDLS session (bssid %02x:%02x:%02x:%02x:%02x:%02x)"),
tdlsSetupReq.LinkIdentifier.bssid[0],
tdlsSetupReq.LinkIdentifier.bssid[1],
tdlsSetupReq.LinkIdentifier.bssid[2],
@@ -3553,15 +3553,15 @@
if ( DOT11F_FAILED( status ) )
{
- limLog(pMac, LOGE, FL("Failed to parse TDLS discovery Request \
- frame (0x%08x, %d bytes):"),status, frmLen);
+ limLog(pMac, LOGE, FL("Failed to parse TDLS discovery Request "
+ "frame (0x%08x, %d bytes):"),status, frmLen);
PELOG2(sirDumpBuf(pMac, SIR_DBG_MODULE_ID, LOG2, pBody, frmLen);)
return eSIR_FAILURE;
}
else if ( DOT11F_WARNED( status ) )
{
- limLog( pMac, LOGW, FL("There were warnings while unpacking an\
- TDLS discovery Request frame (0x%08x," "%d bytes):"),
+ limLog( pMac, LOGW, FL("There were warnings while unpacking a TDLS "
+ "discovery Request frame (0x%08x, %d bytes):"),
status, frmLen );
PELOG2(sirDumpBuf(pMac, SIR_DBG_MODULE_ID, LOG2, pBody, frmLen);)
}
@@ -3575,8 +3575,8 @@
&tdlsSetupRsp.LinkIdentifier.bssid[0], &sessionId) ;
if(NULL == psessionEntry)
{
- VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_ERROR, \
- ("no Seesion entry for TDLS session (bssid %02x:%02x:%02x:%02x:%02x:%02x)"), \
+ VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_ERROR,
+ ("no Seesion entry for TDLS session (bssid %02x:%02x:%02x:%02x:%02x:%02x)"),
tdlsSetupRsp.LinkIdentifier.bssid[0],
tdlsSetupRsp.LinkIdentifier.bssid[1],
tdlsSetupRsp.LinkIdentifier.bssid[2],
@@ -3616,8 +3616,7 @@
if(NULL == setupPeer)
{
- limLog( pMac, LOGE, FL(" unknown setup Response frame \
- other BSS")) ;
+ limLog( pMac, LOGE, FL("unknown setup Response frame other BSS")) ;
return eSIR_FAILURE ;
}
@@ -3692,15 +3691,15 @@
if ( DOT11F_FAILED( status ) )
{
- limLog(pMac, LOGE, FL("Failed to parse an TDLS discovery Response \
- frame (0x%08x, %d bytes):"),status, frmLen);
+ limLog(pMac, LOGE, FL("Failed to parse an TDLS discovery Response "
+ "frame (0x%08x, %d bytes):"),status, frmLen);
PELOG2(sirDumpBuf(pMac, SIR_DBG_MODULE_ID, LOG2, pBody, frmLen);)
return eSIR_FAILURE;
}
else if ( DOT11F_WARNED( status ) )
{
- limLog( pMac, LOGW, FL("There were warnings while unpacking an\
- TDLS discovery Response frame (0x%08x," "%d bytes):"),
+ limLog( pMac, LOGW, FL("There were warnings while unpacking a TDLS "
+ "discovery Response frame (0x%08x, %d bytes):"),
status, frmLen );
PELOG2(sirDumpBuf(pMac, SIR_DBG_MODULE_ID, LOG2, pBody, frmLen);)
}
@@ -3713,8 +3712,8 @@
&tdlsSetupCnf.LinkIdentifier.bssid[0], &sessionId) ;
if(NULL == psessionEntry)
{
- VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_ERROR, \
- ("no Seesion entry for TDLS session (bssid %02x:%02x:%02x:%02x:%02x:%02x)"), \
+ VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_ERROR,
+ ("no Seesion entry for TDLS session (bssid %02x:%02x:%02x:%02x:%02x:%02x)"),
tdlsSetupCnf.LinkIdentifier.bssid[0],
tdlsSetupCnf.LinkIdentifier.bssid[1],
tdlsSetupCnf.LinkIdentifier.bssid[2],
@@ -3815,15 +3814,15 @@
if ( DOT11F_FAILED( status ) )
{
- limLog(pMac, LOGE, FL("Failed to parse an TDLS discovery Response \
- frame (0x%08x, %d bytes):"),status, frmLen);
+ limLog(pMac, LOGE, FL("Failed to parse an TDLS discovery Response "
+ "frame (0x%08x, %d bytes):"),status, frmLen);
PELOG2(sirDumpBuf(pMac, SIR_DBG_MODULE_ID, LOG2, pBody, frmLen);)
return eSIR_FAILURE;
}
else if ( DOT11F_WARNED( status ) )
{
- limLog( pMac, LOGW, FL("There were warnings while unpacking an\
- TDLS discovery Response frame (0x%08x," "%d bytes):"),
+ limLog( pMac, LOGW, FL("There were warnings while unpacking a TDLS "
+ "discovery Response frame (0x%08x, %d bytes):"),
status, frmLen );
PELOG2(sirDumpBuf(pMac, SIR_DBG_MODULE_ID, LOG2, pFrame, nFrame);)
}
@@ -3929,15 +3928,15 @@
if ( DOT11F_FAILED( status ) )
{
- limLog(pMac, LOGE, FL("Failed to parse an TDLS discovery Response \
- frame (0x%08x, %d bytes):"),status, frmLen);
+ limLog(pMac, LOGE, FL("Failed to parse an TDLS discovery Response "
+ "frame (0x%08x, %d bytes):"),status, frmLen);
PELOG2(sirDumpBuf(pMac, SIR_DBG_MODULE_ID, LOG2, pBody, frmLen);)
return eSIR_FAILURE;
}
else if ( DOT11F_WARNED( status ) )
{
- limLog( pMac, LOGW, FL("There were warnings while unpacking an\
- TDLS discovery Response frame (0x%08x," "%d bytes):"),
+ limLog( pMac, LOGW, FL("There were warnings while unpacking a TDLS "
+ "discovery Response frame (0x%08x, %d bytes):"),
status, frmLen );
PELOG2(sirDumpBuf(pMac, SIR_DBG_MODULE_ID, LOG2, pBody, frmLen);)
}
@@ -3951,8 +3950,8 @@
&tdlsTeardown.LinkIdentifier.bssid[0], &sessionId) ;
if(NULL == psessionEntry)
{
- VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_ERROR, \
- ("no Seesion entry for TDLS session (bssid %02x:%02x:%02x:%02x:%02x:%02x)"), \
+ VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_ERROR,
+ ("no Seesion entry for TDLS session (bssid %02x:%02x:%02x:%02x:%02x:%02x)"),
tdlsTeardown.LinkIdentifier.bssid[0],
tdlsTeardown.LinkIdentifier.bssid[1],
tdlsTeardown.LinkIdentifier.bssid[2],
@@ -4075,7 +4074,7 @@
}
frameLen -= (pOffset + PAYLOAD_TYPE_TDLS_SIZE) ;
- LIM_LOG_TDLS(VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_ERROR, ("Received TDLS action %d (%s)"), \
+ LIM_LOG_TDLS(VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_ERROR, ("Received TDLS action %d (%s)"),
action, limTraceTdlsActionString(action) ));
switch(action)
@@ -4384,8 +4383,8 @@
limTdlsFindLinkPeer(pMac, peerMac, &setupPeer) ;
if(NULL == setupPeer) {
VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_ERROR,
- ("limTdlsLinkEstablish: cannot find peer mac in tdls linksetup list: %02X %02X %02X %02X %02X %02X"), \
- peerMac[0], peerMac[1], peerMac[2], \
+ ("limTdlsLinkEstablish: cannot find peer mac in tdls linksetup list: %02X %02X %02X %02X %02X %02X"),
+ peerMac[0], peerMac[1], peerMac[2],
peerMac[3], peerMac[4], peerMac[5]);
return eSIR_FAILURE;
}
@@ -4405,8 +4404,8 @@
pStaDs = dphLookupHashEntry(pMac, peerMac, &aid, &psessionEntry->dph.dphHashTable) ;
if(pStaDs == NULL) {
VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_ERROR,
- ("limTdlsLinkEstablish: cannot find peer mac in hash table: %02X %02X %02X %02X %02X %02X"), \
- peerMac[0], peerMac[1], peerMac[2], \
+ ("limTdlsLinkEstablish: cannot find peer mac in hash table: %02X %02X %02X %02X %02X %02X"),
+ peerMac[0], peerMac[1], peerMac[2],
peerMac[3], peerMac[4], peerMac[5]);
return eSIR_FAILURE;
}
@@ -4478,17 +4477,17 @@
if ( DOT11F_FAILED( status ) )
{
- limLog( pMac, LOGE, FL("Failed to pack a PTI template \
- (0x%08x)."), status );
+ limLog( pMac, LOGE, FL("Failed to pack a PTI template (0x%08x)."),
+ status );
return eSIR_FAILURE;
}
else if ( DOT11F_WARNED( status ) )
{
- limLog( pMac, LOGW, FL("There were warnings while packing TDLS"
- "Peer Traffic Indication (0x%08x).") );
+ limLog( pMac, LOGW, FL("There were warnings while packing TDLS "
+ "Peer Traffic Indication (0x%08x)."), status );
}
- LIM_LOG_TDLS(VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_ERROR, ("bIsResponder=%d, header_offset=%ld, linkIdenOffset=%d, ptiBufStatusOffset=%d "), \
+ LIM_LOG_TDLS(VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_ERROR, ("bIsResponder=%d, header_offset=%ld, linkIdenOffset=%d, ptiBufStatusOffset=%d "),
setupPeer->tdls_bIsResponder, header_offset, PTI_LINK_IDEN_OFFSET, PTI_BUF_STATUS_OFFSET));
limSendTdlsLinkEstablish(pMac, setupPeer->tdls_bIsResponder,
@@ -4513,8 +4512,8 @@
limTdlsFindLinkPeer(pMac, peerMac, &setupPeer) ;
if(NULL == setupPeer) {
VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_ERROR,
- ("limTdlsLinkTeardown: cannot find peer mac in tdls linksetup list: %02X %02X %02X %02X %02X %02X"), \
- peerMac[0], peerMac[1], peerMac[2], \
+ ("limTdlsLinkTeardown: cannot find peer mac in tdls linksetup list: %02X %02X %02X %02X %02X %02X"),
+ peerMac[0], peerMac[1], peerMac[2],
peerMac[3], peerMac[4], peerMac[5]);
return eSIR_FAILURE;
}
@@ -4536,8 +4535,8 @@
if(pStaDs == NULL) {
VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_ERROR,
- ("limTdlsLinkTeardown: cannot find peer mac in hash table: %02X %02X %02X %02X %02X %02X"), \
- peerMac[0], peerMac[1], peerMac[2], \
+ ("limTdlsLinkTeardown: cannot find peer mac in hash table: %02X %02X %02X %02X %02X %02X"),
+ peerMac[0], peerMac[1], peerMac[2],
peerMac[3], peerMac[4], peerMac[5]);
return eSIR_FAILURE;
}
@@ -4604,8 +4603,8 @@
if(((!disStaCount) && (tdlsDisRspList))
|| ((!tdlsDisRspList) && disStaCount))
{
- limLog(pMac, LOG1, FL("mismatch in dis sta count and\
- and number of nodes in list")) ;
+ limLog(pMac, LOG1, FL("mismatch in dis sta count and "
+ "number of nodes in list")) ;
VOS_ASSERT(0) ;
return NULL ;
}
@@ -4967,7 +4966,7 @@
SET_LIM_PROCESS_DEFD_MESGS(pMac, true);
VOS_TRACE(VOS_MODULE_ID_PE, TDLS_DEBUG_LOG_LEVEL,
- ("limTdlsAddStaRsp: staIdx=%d, staMac=%02x:%02x:%02x:%02x:%02x:%02x"), pAddStaParams->staIdx, \
+ ("limTdlsAddStaRsp: staIdx=%d, staMac=%02x:%02x:%02x:%02x:%02x:%02x"), pAddStaParams->staIdx,
pAddStaParams->staMac[0],
pAddStaParams->staMac[1],
pAddStaParams->staMac[2],
@@ -5201,8 +5200,8 @@
(psessionEntry->limSmeState != eLIM_SME_LINK_EST_STATE))
{
- limLog(pMac, LOGE, "send mgmt received in invalid LIMsme \
- state (%d)", psessionEntry->limSmeState);
+ limLog(pMac, LOGE, "send mgmt received in invalid LIMsme "
+ "state (%d)", psessionEntry->limSmeState);
goto lim_tdls_send_mgmt_error;
}
@@ -5398,8 +5397,8 @@
(psessionEntry->limSmeState != eLIM_SME_LINK_EST_STATE))
{
- limLog(pMac, LOGE, "send mgmt received in invalid LIMsme \
- state (%d)", psessionEntry->limSmeState);
+ limLog(pMac, LOGE, "send mgmt received in invalid LIMsme "
+ "state (%d)", psessionEntry->limSmeState);
goto lim_tdls_add_sta_error;
}
@@ -5462,8 +5461,8 @@
(psessionEntry->limSmeState != eLIM_SME_LINK_EST_STATE))
{
- limLog(pMac, LOGE, "Del Sta received in invalid LIMsme \
- state (%d)", psessionEntry->limSmeState);
+ limLog(pMac, LOGE, "Del Sta received in invalid LIMsme state (%d)",
+ psessionEntry->limSmeState);
goto lim_tdls_del_sta_error;
}
@@ -5509,13 +5508,13 @@
tpDphHashNode pStaDs = NULL ;
VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_INFO,
- ("Send Mgmt Recieved\n")) ;
+ ("Send Mgmt Recieved")) ;
if((psessionEntry = peFindSessionByBssid(pMac, pTdlsLinkEstablishReq->bssid, &sessionId))
== NULL)
{
VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_ERROR,
- "PE Session does not exist for given sme sessionId %d\n",
+ "PE Session does not exist for given sme sessionId %d",
pTdlsLinkEstablishReq->sessionId);
limSendSmeTdlsLinkEstablishReqRsp(pMac, pTdlsLinkEstablishReq->sessionId, pTdlsLinkEstablishReq->peerMac,
NULL, eSIR_FAILURE) ;
@@ -5526,7 +5525,7 @@
if (psessionEntry->limSystemRole != eLIM_STA_ROLE)
{
VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_ERROR,
- "TDLS Link Establish Request received in wrong system Role %d\n",
+ "TDLS Link Establish Request received in wrong system Role %d",
psessionEntry->limSystemRole);
goto lim_tdls_link_establish_error;
}
@@ -5539,8 +5538,8 @@
(psessionEntry->limSmeState != eLIM_SME_LINK_EST_STATE))
{
- limLog(pMac, LOGE, "TDLS Link Establish Request received in invalid LIMsme \
- state (%d)\n", psessionEntry->limSmeState);
+ limLog(pMac, LOGE, "TDLS Link Establish Request received in "
+ "invalid LIMsme state (%d)", psessionEntry->limSmeState);
goto lim_tdls_link_establish_error;
}
/*TODO Sunil , TDLSPeer Entry has the STA ID , Use it */
@@ -5548,7 +5547,7 @@
&psessionEntry->dph.dphHashTable) ;
if ( NULL == pStaDs )
{
- limLog( pMac, LOGE, FL( "pStaDs is NULL \n" ));
+ limLog( pMac, LOGE, FL( "pStaDs is NULL" ));
goto lim_tdls_link_establish_error;
}
@@ -5556,7 +5555,7 @@
if ( NULL == pMsgTdlsLinkEstablishReq )
{
limLog( pMac, LOGE,
- FL( "Unable to allocate memory TDLS Link Establish Request \n" ));
+ FL( "Unable to allocate memory TDLS Link Establish Request" ));
return eSIR_MEM_ALLOC_FAILED;
}
@@ -5573,7 +5572,7 @@
msg.bodyval = 0;
if(eSIR_SUCCESS != wdaPostCtrlMsg(pMac, &msg))
{
- limLog(pMac, LOGE, FL("halPostMsgApi failed\n"));
+ limLog(pMac, LOGE, FL("halPostMsgApi failed"));
goto lim_tdls_link_establish_error;
}
return eSIR_SUCCESS;
diff --git a/CORE/MAC/src/pe/lim/limSendManagementFrames.c b/CORE/MAC/src/pe/lim/limSendManagementFrames.c
index b12149e..1e7a0e9 100644
--- a/CORE/MAC/src/pe/lim/limSendManagementFrames.c
+++ b/CORE/MAC/src/pe/lim/limSendManagementFrames.c
@@ -396,7 +396,7 @@
else if ( DOT11F_WARNED( nStatus ) )
{
limLog( pMac, LOGW, FL("There were warnings while packing a P"
- "robe Request (0x%08x).") );
+ "robe Request (0x%08x)."), nStatus );
}
// Append any AddIE if present.
@@ -870,7 +870,7 @@
else if ( DOT11F_WARNED( nStatus ) )
{
limLog( pMac, LOGW, FL("There were warnings while packing a P"
- "robe Response (0x%08x).") );
+ "robe Response (0x%08x)."), nStatus );
}
PELOG3(limLog( pMac, LOG3, FL("Sending Probe Response frame to ") );
@@ -1141,8 +1141,8 @@
}
else if ( DOT11F_WARNED( nStatus ) )
{
- limLog( pMac, LOGW, FL("There were warnings while packing"
- "an Add TS Request (0x%08x).") );
+ limLog( pMac, LOGW, FL("There were warnings while packing "
+ "an Add TS Request (0x%08x)."), nStatus );
}
}
else
@@ -1160,8 +1160,8 @@
}
else if ( DOT11F_WARNED( nStatus ) )
{
- limLog( pMac, LOGW, FL("There were warnings while packing"
- "a WMM Add TS Request (0x%08x).") );
+ limLog( pMac, LOGW, FL("There were warnings while packing "
+ "a WMM Add TS Request (0x%08x)."), nStatus );
}
}
@@ -1360,7 +1360,7 @@
}
else if ( DOT11F_WARNED( nStatus ) )
{
- limLog( pMac, LOGW, FL("There were warnings while calculating"
+ limLog( pMac, LOGW, FL("There were warnings while calculating "
"the packed size for an Association Re"
"sponse (0x%08x)."), nStatus );
}
@@ -1446,7 +1446,7 @@
else if ( DOT11F_WARNED( nStatus ) )
{
limLog( pMac, LOGW, FL("There were warnings while packing an "
- "Association Response (0x%08x).") );
+ "Association Response (0x%08x)."), nStatus );
}
macAddr = pMacHdr->da;
@@ -1627,7 +1627,7 @@
else if ( DOT11F_WARNED( nStatus ) )
{
limLog( pMac, LOGW, FL("There were warnings while calcula"
- "tingthe packed size for an Add TS"
+ "ting the packed size for an Add TS"
" Response (0x%08x)."), nStatus );
}
}
@@ -1654,7 +1654,7 @@
else if ( DOT11F_WARNED( nStatus ) )
{
limLog( pMac, LOGW, FL("There were warnings while calcula"
- "tingthe packed size for a WMM Add"
+ "ting the packed size for a WMM Add"
"TS Response (0x%08x)."), nStatus );
}
}
@@ -1719,8 +1719,8 @@
}
else if ( DOT11F_WARNED( nStatus ) )
{
- limLog( pMac, LOGW, FL("There were warnings while packing"
- "an Add TS Response (0x%08x).") );
+ limLog( pMac, LOGW, FL("There were warnings while packing "
+ "an Add TS Response (0x%08x)."), nStatus );
}
}
else
@@ -1738,8 +1738,8 @@
}
else if ( DOT11F_WARNED( nStatus ) )
{
- limLog( pMac, LOGW, FL("There were warnings while packing"
- "a WMM Add TS Response (0x%08x).") );
+ limLog( pMac, LOGW, FL("There were warnings while packing "
+ "a WMM Add TS Response (0x%08x)."), nStatus );
}
}
@@ -1904,8 +1904,8 @@
}
else if ( DOT11F_WARNED( nStatus ) )
{
- limLog( pMac, LOGW, FL("There were warnings while packing"
- "a Del TS frame (0x%08x).") );
+ limLog( pMac, LOGW, FL("There were warnings while packing "
+ "a Del TS frame (0x%08x)."), nStatus );
}
}
else
@@ -1922,8 +1922,8 @@
}
else if ( DOT11F_WARNED( nStatus ) )
{
- limLog( pMac, LOGW, FL("There were warnings while packing"
- "a WMM Del TS frame (0x%08x).") );
+ limLog( pMac, LOGW, FL("There were warnings while packing "
+ "a WMM Del TS frame (0x%08x)."), nStatus );
}
}
@@ -2204,7 +2204,7 @@
}
else if ( DOT11F_WARNED( nStatus ) )
{
- limLog( pMac, LOGW, FL("There were warnings while calculating"
+ limLog( pMac, LOGW, FL("There were warnings while calculating "
"the packed size for an Association Re "
"quest(0x%08x)."), nStatus );
}
@@ -2272,7 +2272,7 @@
else if ( DOT11F_WARNED( nStatus ) )
{
limLog( pMac, LOGW, FL("There were warnings while packing a P"
- "robe Response (0x%08x).") );
+ "robe Response (0x%08x)."), nStatus );
}
PELOG1(limLog( pMac, LOG1, FL("*** Sending Association Request length %d"
@@ -2598,7 +2598,7 @@
}
else if ( DOT11F_WARNED( nStatus ) )
{
- limLog( pMac, LOGW, FL("There were warnings while calculating"
+ limLog( pMac, LOGW, FL("There were warnings while calculating "
"the packed size for a Re-Association Re "
"quest(0x%08x)."), nStatus );
}
@@ -2664,7 +2664,7 @@
else if ( DOT11F_WARNED( nStatus ) )
{
limLog( pMac, LOGW, FL("There were warnings while packing a R"
- "e-Association Request (0x%08x).") );
+ "e-Association Request (0x%08x)."), nStatus );
}
PELOG3(limLog( pMac, LOG3,
@@ -3011,7 +3011,7 @@
}
else if ( DOT11F_WARNED( nStatus ) )
{
- limLog( pMac, LOGW, FL("There were warnings while calculating"
+ limLog( pMac, LOGW, FL("There were warnings while calculating "
"the packed size for a Re-Association Re "
"quest(0x%08x)."), nStatus );
}
@@ -3062,7 +3062,7 @@
else if ( DOT11F_WARNED( nStatus ) )
{
limLog( pMac, LOGW, FL("There were warnings while packing a R"
- "e-Association Request (0x%08x).") );
+ "e-Association Request (0x%08x)."), nStatus );
}
PELOG1(limLog( pMac, LOG1, FL("*** Sending Re-Association Request length %d"
@@ -3666,7 +3666,7 @@
}
else if ( DOT11F_WARNED( nStatus ) )
{
- limLog( pMac, LOGW, FL("There were warnings while calculating"
+ limLog( pMac, LOGW, FL("There were warnings while calculating "
"the packed size for a Disassociation "
"(0x%08x)."), nStatus );
}
@@ -3722,7 +3722,7 @@
else if ( DOT11F_WARNED( nStatus ) )
{
limLog( pMac, LOGW, FL("There were warnings while packing a D"
- "isassociation (0x%08x).") );
+ "isassociation (0x%08x)."), nStatus );
}
PELOG1(limLog( pMac, LOG1, FL("*** Sending Disassociation frame with rea"
@@ -3846,7 +3846,7 @@
}
else if ( DOT11F_WARNED( nStatus ) )
{
- limLog( pMac, LOGW, FL("There were warnings while calculating"
+ limLog( pMac, LOGW, FL("There were warnings while calculating "
"the packed size for a De-Authentication "
"(0x%08x)."), nStatus );
}
@@ -3902,7 +3902,7 @@
else if ( DOT11F_WARNED( nStatus ) )
{
limLog( pMac, LOGW, FL("There were warnings while packing a D"
- "e-Authentication (0x%08x).") );
+ "e-Authentication (0x%08x)."), nStatus );
}
PELOG1(limLog( pMac, LOG1, FL("*** Sending De-Authentication frame with rea"
@@ -4075,7 +4075,7 @@
}
else if ( DOT11F_WARNED( nStatus ) )
{
- limLog( pMac, LOGW, FL("There were warnings while calculating"
+ limLog( pMac, LOGW, FL("There were warnings while calculating "
"the packed size for a Measurement Rep"
"ort (0x%08x)."), nStatus );
}
@@ -4135,7 +4135,7 @@
else if ( DOT11F_WARNED( nStatus ) )
{
limLog( pMac, LOGW, FL("There were warnings while packing a M"
- "easurement Report (0x%08x).") );
+ "easurement Report (0x%08x)."), nStatus );
}
halstatus = halTxFrame( pMac, pPacket, ( tANI_U16 ) nBytes,
@@ -4198,7 +4198,7 @@
}
else if ( DOT11F_WARNED( nStatus ) )
{
- limLog( pMac, LOGW, FL("There were warnings while calculating"
+ limLog( pMac, LOGW, FL("There were warnings while calculating "
"the packed size for a TPC Request (0x"
"%08x)."), nStatus );
}
@@ -4258,7 +4258,7 @@
else if ( DOT11F_WARNED( nStatus ) )
{
limLog( pMac, LOGW, FL("There were warnings while packing a T"
- "PC Request (0x%08x).") );
+ "PC Request (0x%08x)."), nStatus );
}
halstatus = halTxFrame( pMac, pPacket, ( tANI_U16 ) nBytes,
@@ -4329,7 +4329,7 @@
}
else if ( DOT11F_WARNED( nStatus ) )
{
- limLog( pMac, LOGW, FL("There were warnings while calculating"
+ limLog( pMac, LOGW, FL("There were warnings while calculating "
"the packed size for a TPC Report (0x"
"%08x)."), nStatus );
}
@@ -4389,7 +4389,7 @@
else if ( DOT11F_WARNED( nStatus ) )
{
limLog( pMac, LOGW, FL("There were warnings while packing a T"
- "PC Report (0x%08x).") );
+ "PC Report (0x%08x)."), nStatus );
}
@@ -4469,7 +4469,7 @@
}
else if ( DOT11F_WARNED( nStatus ) )
{
- limLog( pMac, LOGW, FL("There were warnings while calculating"
+ limLog( pMac, LOGW, FL("There were warnings while calculating "
"the packed size for a Channel Switch (0x"
"%08x)."), nStatus );
}
@@ -4535,7 +4535,7 @@
else if ( DOT11F_WARNED( nStatus ) )
{
limLog( pMac, LOGW, FL("There were warnings while packing a C"
- "hannel Switch (0x%08x).") );
+ "hannel Switch (0x%08x)."), nStatus );
}
if( ( SIR_BAND_5_GHZ == limGetRFBand(psessionEntry->currentOperChannel))
@@ -4600,7 +4600,7 @@
}
else if ( DOT11F_WARNED( nStatus ) )
{
- limLog( pMac, LOGW, FL("There were warnings while calculating"
+ limLog( pMac, LOGW, FL("There were warnings while calculating "
"the packed size for a Operating Mode (0x"
"%08x)."), nStatus );
}
@@ -4651,7 +4651,7 @@
else if ( DOT11F_WARNED( nStatus ) )
{
limLog( pMac, LOGW, FL("There were warnings while packing a Operating Mode"
- " (0x%08x).") );
+ " (0x%08x)."), nStatus );
}
if( ( SIR_BAND_5_GHZ == limGetRFBand(psessionEntry->currentOperChannel))
|| ( psessionEntry->pePersona == VOS_P2P_CLIENT_MODE ) ||
@@ -4739,7 +4739,7 @@
}
else if ( DOT11F_WARNED( nStatus ) )
{
- limLog( pMac, LOGW, FL("There were warnings while calculating"
+ limLog( pMac, LOGW, FL("There were warnings while calculating "
"the packed size for a Channel Switch (0x"
"%08x)."), nStatus );
}
@@ -4784,7 +4784,7 @@
else if ( DOT11F_WARNED( nStatus ) )
{
limLog( pMac, LOGW, FL("There were warnings while packing a C"
- "hannel Switch (0x%08x).") );
+ "hannel Switch (0x%08x)."), nStatus );
}
if( ( SIR_BAND_5_GHZ == limGetRFBand(psessionEntry->currentOperChannel))
@@ -4891,7 +4891,7 @@
else if( DOT11F_WARNED( nStatus ))
{
limLog( pMac, LOGW,
- FL( "There were warnings while calculating"
+ FL( "There were warnings while calculating "
"the packed size for an ADDBA Req (0x%08x)."),
nStatus );
}
@@ -4973,7 +4973,8 @@
else if( DOT11F_WARNED( nStatus ))
{
limLog( pMac, LOGW,
- FL( "There were warnings while packing an ADDBA Req (0x%08x)." ));
+ FL( "There were warnings while packing an ADDBA Req (0x%08x)."),
+ nStatus );
}
limLog( pMac, LOGW,
@@ -5102,7 +5103,7 @@
else if( DOT11F_WARNED( nStatus ))
{
limLog( pMac, LOGW,
- FL( "There were warnings while calculating"
+ FL( "There were warnings while calculating "
"the packed size for an ADDBA Rsp (0x%08x)."),
nStatus );
}
@@ -5185,7 +5186,8 @@
else if( DOT11F_WARNED( nStatus ))
{
limLog( pMac, LOGW,
- FL( "There were warnings while packing an ADDBA Rsp (0x%08x)." ));
+ FL( "There were warnings while packing an ADDBA Rsp (0x%08x)." ),
+ nStatus);
}
limLog( pMac, LOGW,
@@ -5301,7 +5303,7 @@
else if( DOT11F_WARNED( nStatus ))
{
limLog( pMac, LOGW,
- FL( "There were warnings while calculating"
+ FL( "There were warnings while calculating "
"the packed size for an DELBA Ind (0x%08x)."),
nStatus );
}
@@ -5383,7 +5385,8 @@
else if( DOT11F_WARNED( nStatus ))
{
limLog( pMac, LOGW,
- FL( "There were warnings while packing an DELBA Ind (0x%08x)." ));
+ FL( "There were warnings while packing an DELBA Ind (0x%08x)." ),
+ nStatus);
}
limLog( pMac, LOGW,
@@ -5491,7 +5494,7 @@
}
else if ( DOT11F_WARNED( nStatus ) )
{
- limLog( pMac, LOGW, FL("There were warnings while calculating"
+ limLog( pMac, LOGW, FL("There were warnings while calculating "
"the packed size for a Neighbor Rep"
"ort Request(0x%08x)."), nStatus );
}
@@ -5547,7 +5550,8 @@
else if( DOT11F_WARNED( nStatus ))
{
limLog( pMac, LOGW,
- FL( "There were warnings while packing Neighbor Report Request (0x%08x)." ));
+ FL( "There were warnings while packing Neighbor Report "
+ "Request (0x%08x)." ), nStatus);
}
limLog( pMac, LOGW,
@@ -5659,7 +5663,7 @@
}
else if ( DOT11F_WARNED( nStatus ) )
{
- limLog( pMac, LOGW, FL("There were warnings while calculating"
+ limLog( pMac, LOGW, FL("There were warnings while calculating "
"the packed size for a Link Rep"
"ort (0x%08x)."), nStatus );
}
@@ -5715,7 +5719,8 @@
else if( DOT11F_WARNED( nStatus ))
{
limLog( pMac, LOGW,
- FL( "There were warnings while packing Link Report (0x%08x)." ));
+ FL( "There were warnings while packing Link Report (0x%08x)." ),
+ nStatus );
}
limLog( pMac, LOGW,
@@ -5848,7 +5853,7 @@
}
else if ( DOT11F_WARNED( nStatus ) )
{
- limLog( pMac, LOGW, FL("There were warnings while calculating"
+ limLog( pMac, LOGW, FL("There were warnings while calculating "
"the packed size for a Radio Measure Rep"
"ort (0x%08x)."), nStatus );
}
@@ -5905,7 +5910,8 @@
else if( DOT11F_WARNED( nStatus ))
{
limLog( pMac, LOGW,
- FL( "There were warnings while packing Radio Measure Report (0x%08x)." ));
+ FL( "There were warnings while packing Radio "
+ "Measure Report (0x%08x)." ), nStatus);
}
limLog( pMac, LOGW,
@@ -6002,7 +6008,7 @@
}
else if ( DOT11F_WARNED( nStatus ) )
{
- limLog( pMac, LOGW, FL("There were warnings while calculating"
+ limLog( pMac, LOGW, FL("There were warnings while calculating "
"the packed size for an SA Query Response"
" (0x%08x)."), nStatus );
}
diff --git a/CORE/MAC/src/pe/lim/limSendMessages.c b/CORE/MAC/src/pe/lim/limSendMessages.c
index 368726c..0c5d5d0 100644
--- a/CORE/MAC/src/pe/lim/limSendMessages.c
+++ b/CORE/MAC/src/pe/lim/limSendMessages.c
@@ -496,7 +496,8 @@
if (retCode != eSIR_SUCCESS)
{
vos_mem_free(pLinkStateParams);
- limLog(pMac, LOGP, FL("Posting link state %d failed, reason = %x "), retCode);
+ limLog(pMac, LOGP, FL("Posting link state %d failed, reason = %x "),
+ state, retCode);
}
return retCode;
}
@@ -541,7 +542,8 @@
if (retCode != eSIR_SUCCESS)
{
vos_mem_free(pLinkStateParams);
- limLog(pMac, LOGP, FL("Posting link state %d failed, reason = %x "), retCode);
+ limLog(pMac, LOGP, FL("Posting link state %d failed, reason = %x "),
+ state, retCode);
}
return retCode;
}
diff --git a/CORE/MAC/src/pe/lim/limTimerUtils.c b/CORE/MAC/src/pe/lim/limTimerUtils.c
index e3df2cb..6a12e0c 100644
--- a/CORE/MAC/src/pe/lim/limTimerUtils.c
+++ b/CORE/MAC/src/pe/lim/limTimerUtils.c
@@ -1420,7 +1420,7 @@
}
else
{
- limLog(pMac, LOGW, FL("HeartBeat timer value is changed = %lu"), val);
+ limLog(pMac, LOGW, FL("HeartBeat timer value is changed = %u"), val);
}
break;
@@ -1462,7 +1462,7 @@
}
else
{
- limLog(pMac, LOGW, FL("Probe after HB timer value is changed = %lu"), val);
+ limLog(pMac, LOGW, FL("Probe after HB timer value is changed = %u"), val);
}
break;