Remove the redundant new line in PE logs
Remove the \n in log messages as the VOS_TRACE introduces the new
line at the end of the log message.
Change-Id: I86469483c752c57a49872dc4c4643bc67634489d
CRs-Fixed: 441138
Conflicts:
CORE/MAC/src/pe/lim/limAIDmgmt.c
CORE/MAC/src/pe/lim/limAdmitControl.c
diff --git a/CORE/MAC/src/pe/lim/limApi.c b/CORE/MAC/src/pe/lim/limApi.c
index 9404d40..68f0d4b 100644
--- a/CORE/MAC/src/pe/lim/limApi.c
+++ b/CORE/MAC/src/pe/lim/limApi.c
@@ -452,13 +452,13 @@
if(wlan_cfgGetInt(pMac, WNI_CFG_HT_CAP_INFO, &val1) != eSIR_SUCCESS)
{
- PELOGE(limLog(pMac, LOGE, FL("could not retrieve HT Cap CFG\n"));)
+ PELOGE(limLog(pMac, LOGE, FL("could not retrieve HT Cap CFG"));)
return eSIR_FAILURE;
}
if(wlan_cfgGetInt(pMac, WNI_CFG_CHANNEL_BONDING_MODE, &val2) != eSIR_SUCCESS)
{
- PELOGE(limLog(pMac, LOGE, FL("could not retrieve Channel Bonding CFG\n"));)
+ PELOGE(limLog(pMac, LOGE, FL("could not retrieve Channel Bonding CFG"));)
return eSIR_FAILURE;
}
val16 = ( tANI_U16 ) val1;
@@ -471,13 +471,13 @@
if(cfgSetInt(pMac, WNI_CFG_HT_CAP_INFO, *(tANI_U16*)pHTCapabilityInfo)
!= eSIR_SUCCESS)
{
- PELOGE(limLog(pMac, LOGE, FL("could not update HT Cap Info CFG\n"));)
+ PELOGE(limLog(pMac, LOGE, FL("could not update HT Cap Info CFG"));)
return eSIR_FAILURE;
}
if(wlan_cfgGetInt(pMac, WNI_CFG_HT_INFO_FIELD1, &val1) != eSIR_SUCCESS)
{
- PELOGE(limLog(pMac, LOGE, FL("could not retrieve HT INFO Field1 CFG\n"));)
+ PELOGE(limLog(pMac, LOGE, FL("could not retrieve HT INFO Field1 CFG"));)
return eSIR_FAILURE;
}
@@ -488,7 +488,7 @@
if(cfgSetInt(pMac, WNI_CFG_HT_INFO_FIELD1, *(tANI_U8*)pHTInfoField1)
!= eSIR_SUCCESS)
{
- PELOGE(limLog(pMac, LOGE, FL("could not update HT Info Field\n"));)
+ PELOGE(limLog(pMac, LOGE, FL("could not update HT Info Field"));)
return eSIR_FAILURE;
}
@@ -497,7 +497,7 @@
if( wlan_cfgGetInt(pMac, WNI_CFG_HEART_BEAT_THRESHOLD, &val1) !=
eSIR_SUCCESS )
{
- PELOGE(limLog(pMac, LOGE, FL("could not retrieve WNI_CFG_HEART_BEAT_THRESHOLD CFG\n"));)
+ PELOGE(limLog(pMac, LOGE, FL("could not retrieve WNI_CFG_HEART_BEAT_THRESHOLD CFG"));)
return eSIR_FAILURE;
}
if(!val1)
@@ -515,17 +515,17 @@
if (wlan_cfgGetInt(pMac, WNI_CFG_HT_CAP_INFO, &val1) != eSIR_SUCCESS)
{
- PELOGE(limLog(pMac, LOGE, FL("could not retrieve HT Cap CFG\n"));)
+ PELOGE(limLog(pMac, LOGE, FL("could not retrieve HT Cap CFG"));)
return eSIR_FAILURE;
}
if (wlan_cfgGetInt(pMac, WNI_CFG_SHORT_GI_20MHZ, &val2) != eSIR_SUCCESS)
{
- PELOGE(limLog(pMac, LOGE, FL("could not retrieve shortGI 20Mhz CFG\n"));)
+ PELOGE(limLog(pMac, LOGE, FL("could not retrieve shortGI 20Mhz CFG"));)
return eSIR_FAILURE;
}
if (wlan_cfgGetInt(pMac, WNI_CFG_SHORT_GI_40MHZ, &val3) != eSIR_SUCCESS)
{
- PELOGE(limLog(pMac, LOGE, FL("could not retrieve shortGI 40Mhz CFG\n"));)
+ PELOGE(limLog(pMac, LOGE, FL("could not retrieve shortGI 40Mhz CFG"));)
return eSIR_FAILURE;
}
@@ -537,7 +537,7 @@
if(cfgSetInt(pMac, WNI_CFG_HT_CAP_INFO, *(tANI_U16*)pHTCapabilityInfo) !=
eSIR_SUCCESS)
{
- PELOGE(limLog(pMac, LOGE, FL("could not update HT Cap Info CFG\n"));)
+ PELOGE(limLog(pMac, LOGE, FL("could not update HT Cap Info CFG"));)
return eSIR_FAILURE;
}
@@ -545,12 +545,12 @@
if (wlan_cfgGetInt(pMac, WNI_CFG_HT_AMPDU_PARAMS, &val1) != eSIR_SUCCESS)
{
- PELOGE(limLog(pMac, LOGE, FL("could not retrieve HT AMPDU Param CFG\n"));)
+ PELOGE(limLog(pMac, LOGE, FL("could not retrieve HT AMPDU Param CFG"));)
return eSIR_FAILURE;
}
if (wlan_cfgGetInt(pMac, WNI_CFG_MAX_RX_AMPDU_FACTOR, &val2) != eSIR_SUCCESS)
{
- PELOGE(limLog(pMac, LOGE, FL("could not retrieve AMPDU Factor CFG\n"));)
+ PELOGE(limLog(pMac, LOGE, FL("could not retrieve AMPDU Factor CFG"));)
return eSIR_FAILURE;
}
val16 = ( tANI_U16 ) val1;
@@ -559,7 +559,7 @@
if(cfgSetInt(pMac, WNI_CFG_HT_AMPDU_PARAMS, *(tANI_U8*)pAmpduParamInfo) !=
eSIR_SUCCESS)
{
- PELOGE(limLog(pMac, LOGE, FL("could not update HT AMPDU Param CFG\n"));)
+ PELOGE(limLog(pMac, LOGE, FL("could not update HT AMPDU Param CFG"));)
return eSIR_FAILURE;
}
@@ -567,7 +567,7 @@
limHandleCFGparamUpdate do we want to update this? */
if(wlan_cfgGetInt(pMac, WNI_CFG_SHORT_PREAMBLE, &val1) != eSIR_SUCCESS)
{
- limLog(pMac, LOGP, FL("cfg get short preamble failed\n"));
+ limLog(pMac, LOGP, FL("cfg get short preamble failed"));
return eSIR_FAILURE;
}
@@ -578,7 +578,7 @@
sizeof(tSirPowerSaveCfg)) != eHAL_STATUS_SUCCESS)
{
PELOGE(limLog(pMac, LOGE, FL("LIM: Cannot allocate memory for power save "
- "configuration\n"));)
+ "configuration"));)
return eSIR_FAILURE;
}
@@ -592,14 +592,14 @@
/* Note: it is okay to do this since DAL/HAL is alrady started */
if ( (pmmSendPowerSaveCfg(pMac, pPowerSaveConfig)) != eSIR_SUCCESS)
{
- PELOGE(limLog(pMac, LOGE, FL("LIM: pmmSendPowerSaveCfg() failed \n"));)
+ PELOGE(limLog(pMac, LOGE, FL("LIM: pmmSendPowerSaveCfg() failed "));)
return eSIR_FAILURE;
}
/* WNI_CFG_BG_SCAN_CHANNEL_LIST_CHANNEL_LIST */
PELOG1(limLog(pMac, LOG1,
- FL("VALID_CHANNEL_LIST has changed, reset next bg scan channel\n"));)
+ FL("VALID_CHANNEL_LIST has changed, reset next bg scan channel"));)
pMac->lim.gLimBackgroundScanChannelId = 0;
/* WNI_CFG_PROBE_RSP_BCN_ADDNIE_DATA - not needed */
@@ -609,7 +609,7 @@
handleHTCapabilityandHTInfo(pMac, NULL);
if(wlan_cfgGetInt(pMac, WNI_CFG_DISABLE_LDPC_WITH_TXBF_AP,(tANI_U32 *) &pMac->lim.disableLDPCWithTxbfAP) != eSIR_SUCCESS)
{
- limLog(pMac, LOGP, FL("cfg get disableLDPCWithTxbfAP failed\n"));
+ limLog(pMac, LOGP, FL("cfg get disableLDPCWithTxbfAP failed"));
return eSIR_FAILURE;
}
@@ -625,7 +625,7 @@
{
tSirResultCodes retCode = eSIR_SUCCESS;
- PELOG1(limLog(pMac, LOG1, FL(" enter\n"));)
+ PELOG1(limLog(pMac, LOG1, FL(" enter"));)
if (pMac->lim.gLimSmeState == eLIM_SME_OFFLINE_STATE)
{
@@ -650,7 +650,7 @@
* other than OFFLINE. Return response to host and
* log error
*/
- limLog(pMac, LOGE, FL("Invalid SME state %X\n"),pMac->lim.gLimSmeState );
+ limLog(pMac, LOGE, FL("Invalid SME state %X"),pMac->lim.gLimSmeState );
retCode = eSIR_FAILURE;
}
@@ -924,7 +924,7 @@
retStatus = WLANTL_DeRegisterMgmtFrmClient(pvosGCTx);
if ( retStatus != VOS_STATUS_SUCCESS )
- PELOGE(limLog(pMac, LOGE, FL("DeRegistering the PE Handle with TL has failed bailing out...\n"));)
+ PELOGE(limLog(pMac, LOGE, FL("DeRegistering the PE Handle with TL has failed bailing out..."));)
#if defined WLAN_FEATURE_VOWIFI
rrmCleanup(pMac);
@@ -951,14 +951,14 @@
if ((pMac->lim.maxBssId == 0) || (pMac->lim.maxStation == 0))
{
- PELOGE(limLog(pMac, LOGE, FL("max number of Bssid or Stations cannot be zero!\n"));)
+ PELOGE(limLog(pMac, LOGE, FL("max number of Bssid or Stations cannot be zero!"));)
return eSIR_FAILURE;
}
if (eHAL_STATUS_SUCCESS != palAllocateMemory(pMac->hHdd,
(void **) &pMac->lim.limTimers.gpLimCnfWaitTimer, sizeof(TX_TIMER)*pMac->lim.maxStation))
{
- PELOGE(limLog(pMac, LOGE, FL("memory allocate failed!\n"));)
+ PELOGE(limLog(pMac, LOGE, FL("memory allocate failed!"));)
return eSIR_FAILURE;
}
@@ -967,14 +967,14 @@
(void **) &pMac->lim.gpLimAIDpool,
sizeof(*pMac->lim.gpLimAIDpool) * (WNI_CFG_ASSOC_STA_LIMIT_STAMAX+1)))
{
- PELOGE(limLog(pMac, LOGE, FL("memory allocate failed!\n"));)
+ PELOGE(limLog(pMac, LOGE, FL("memory allocate failed!"));)
return eSIR_FAILURE;
}
#endif
if (eHAL_STATUS_SUCCESS != palAllocateMemory(pMac->hHdd,
(void **) &pMac->lim.gpSession, sizeof(tPESession)* pMac->lim.maxBssId))
{
- limLog(pMac, LOGE, FL("memory allocate failed!\n"));
+ limLog(pMac, LOGE, FL("memory allocate failed!"));
return eSIR_FAILURE;
}
@@ -985,14 +985,14 @@
if (eHAL_STATUS_SUCCESS != palAllocateMemory(pMac->hHdd,
(void **) &pMac->dph.dphHashTable.pHashTable, sizeof(tpDphHashNode)*pMac->lim.maxStation))
{
- PELOGE(limLog(pMac, LOGE, FL("memory allocate failed!\n"));)
+ PELOGE(limLog(pMac, LOGE, FL("memory allocate failed!"));)
return eSIR_FAILURE;
}
if (eHAL_STATUS_SUCCESS != palAllocateMemory(pMac->hHdd,
(void **) &pMac->dph.dphHashTable.pDphNodeArray, sizeof(tDphHashNode)*pMac->lim.maxStation))
{
- PELOGE(limLog(pMac, LOGE, FL("memory allocate failed!\n"));)
+ PELOGE(limLog(pMac, LOGE, FL("memory allocate failed!"));)
return eSIR_FAILURE;
}
*/
@@ -1000,7 +1000,7 @@
if (eHAL_STATUS_SUCCESS != palAllocateMemory(pMac->hHdd,
(void **) &pMac->pmm.gPmmTim.pTim, sizeof(tANI_U8)*pMac->lim.maxStation))
{
- PELOGE(limLog(pMac, LOGE, FL("memory allocate failed for pTim!\n"));)
+ PELOGE(limLog(pMac, LOGE, FL("memory allocate failed for pTim!"));)
return eSIR_FAILURE;
}
palZeroMemory(pMac->hHdd, pMac->pmm.gPmmTim.pTim, sizeof(tANI_U8)*pMac->lim.maxStation);
@@ -1009,7 +1009,7 @@
if( !VOS_IS_STATUS_SUCCESS( vos_lock_init( &pMac->lim.lkPeGlobalLock ) ) )
{
- PELOGE(limLog(pMac, LOGE, FL("pe lock init failed!\n"));)
+ PELOGE(limLog(pMac, LOGE, FL("pe lock init failed!"));)
return eSIR_FAILURE;
}
return eSIR_SUCCESS;
@@ -1341,7 +1341,7 @@
if(mHdr->fc.type == SIR_MAC_MGMT_FRAME)
{
PELOG1(limLog( pMac, LOG1,
- FL ( "RxBd=%p mHdr=%p Type: %d Subtype: %d Sizes:FC%d Mgmt%d\n"),
+ FL ( "RxBd=%p mHdr=%p Type: %d Subtype: %d Sizes:FC%d Mgmt%d"),
pRxPacketInfo, mHdr, mHdr->fc.type, mHdr->fc.subType, sizeof(tSirMacFrameCtl), sizeof(tSirMacMgmtHdr) );)
MTRACE(macTrace(pMac, TRACE_CODE_RX_MGMT, NO_SESSION,
@@ -1362,7 +1362,7 @@
{
vos_pkt_return_packet(pVosPkt);
limLog( pMac, LOGW,
- FL ( "sysBbtProcessMessageCore failed to process SIR_BB_XPORT_MGMT_MSG\n" ));
+ FL ( "sysBbtProcessMessageCore failed to process SIR_BB_XPORT_MGMT_MSG" ));
return VOS_STATUS_E_FAILURE;
}
@@ -1395,7 +1395,7 @@
retStatus = WLANTL_RegisterMgmtFrmClient(pvosGCTx, peHandleMgmtFrame);
if (retStatus != VOS_STATUS_SUCCESS)
- limLog( pMac, LOGP, FL("Registering the PE Handle with TL has failed bailing out...\n"));
+ limLog( pMac, LOGP, FL("Registering the PE Handle with TL has failed bailing out..."));
}
@@ -1607,7 +1607,7 @@
if (i == LIM_PROT_STA_OVERLAP_CACHE_SIZE)
{
- PELOG1(limLog(pMac, LOG1, FL("Overlap cache is full\n"));)
+ PELOG1(limLog(pMac, LOG1, FL("Overlap cache is full"));)
}
else
{
@@ -1729,7 +1729,7 @@
if (newChannel != psessionEntry->currentOperChannel)
{
PELOGE(limLog(pMac, LOGE, FL("Channel Change from %d --> %d - "
- "Ignoring beacon!\n"),
+ "Ignoring beacon!"),
psessionEntry->currentOperChannel, newChannel);)
return;
}
@@ -1748,7 +1748,7 @@
(pBeacon->rsnPresent || pBeacon->wpaPresent))
{
PELOGE(limLog(pMac, LOGE, FL("BSS Caps (Privacy) bit 0 in beacon,"
- " but WPA or RSN IE present, Ignore Beacon!\n"));)
+ " but WPA or RSN IE present, Ignore Beacon!"));)
return;
}
else
@@ -1797,7 +1797,7 @@
!= eSIR_SUCCESS)
{
limLog(pMac, LOGP,
- FL("cfg get WNI_CFG_11G_SHORT_SLOT_TIME failed\n"));
+ FL("cfg get WNI_CFG_11G_SHORT_SLOT_TIME failed"));
return eSIR_FAILURE;
}
if (val == false)
@@ -1834,7 +1834,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\n"), nShortSlot);)
+ PELOG1(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;
@@ -1868,13 +1868,13 @@
(pMac->pmm.gPmmState == ePMM_STATE_UAPSD_SLEEP)||
(pMac->pmm.gPmmState == ePMM_STATE_WOWLAN) )
{
- PELOG1(limLog(pMac, LOG1, FL("Sending LOW_RSSI_IND to SME \n"));)
+ PELOG1(limLog(pMac, LOG1, FL("Sending LOW_RSSI_IND to SME "));)
limSendSmeRsp(pMac, eWNI_SME_LOW_RSSI_IND, eSIR_SME_SUCCESS, 0, 0);
}
else
{
limLog(pMac, LOGE,
- FL("Received SIR_HAL_LOW_RSSI_IND while in incorrect state: %d\n"),
+ FL("Received SIR_HAL_LOW_RSSI_IND while in incorrect state: %d"),
pMac->pmm.gPmmState);
}
return;
@@ -1908,13 +1908,13 @@
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 \n"));)
+ PELOG1(limLog(pMac, LOG1, FL("Sending EXIT_BMPS_IND to SME "));)
limSendExitBmpsInd(pMac, eSME_BMPS_STATUS_IND_RCVD);
break;
default:
limLog(pMac, LOGE,
- FL("Received SIR_HAL_BMPS_STATUS_IND while in incorrect state: %d\n"),
+ FL("Received SIR_HAL_BMPS_STATUS_IND while in incorrect state: %d"),
pMac->pmm.gPmmState);
break;
}
@@ -1952,7 +1952,7 @@
(pMac->pmm.gPmmState == ePMM_STATE_WOWLAN) )
{
pMac->pmm.inMissedBeaconScenario = TRUE;
- PELOG1(limLog(pMac, LOG1, FL("Sending EXIT_BMPS_IND to SME \n"));)
+ PELOG1(limLog(pMac, LOG1, FL("Sending EXIT_BMPS_IND to SME "));)
limSendExitBmpsInd(pMac, eSME_MISSED_BEACON_IND_RCVD);
}
/* ACTIVE_MODE_HB_OFFLOAD */
@@ -1962,14 +1962,14 @@
(IS_ACTIVEMODE_OFFLOAD_FEATURE_ENABLE))
{
pMac->pmm.inMissedBeaconScenario = TRUE;
- PELOGE(limLog(pMac, LOGE, FL("Received Heart Beat Failure\n"));)
+ PELOGE(limLog(pMac, LOGE, FL("Received Heart Beat Failure"));)
limMissedBeaconInActiveMode(pMac, psessionEntry);
}
#endif
else
{
limLog(pMac, LOGE,
- FL("Received SIR_HAL_MISSED_BEACON_IND while in incorrect state: %d\n"),
+ FL("Received SIR_HAL_MISSED_BEACON_IND while in incorrect state: %d"),
pMac->pmm.gPmmState);
}
return;
@@ -1995,7 +1995,7 @@
if((psessionEntry = peFindSessionByBssid(pMac,pSirMicFailureInd->bssId,&sessionId))== NULL)
{
limLog(pMac, LOGE,
- FL("session does not exist for given BSSId\n"));
+ FL("session does not exist for given BSSId"));
return;
}
@@ -2006,7 +2006,7 @@
{
// Log error
limLog(pMac, LOGP,
- FL("memory allocate failed for eWNI_SME_MIC_FAILURE_IND\n"));
+ FL("memory allocate failed for eWNI_SME_MIC_FAILURE_IND"));
return;
}