TDLS: Make tdls logging as per UMAC modules
TDLS module uses different macros to enable/disable logging.
Change the same to match other UMAC modules. This will enable
the tdls logs to be routed to logger application.
Change-Id: Iad59cef34a1d98917e9cdfb605461821c89e0c1e
CRs-Fixed: 754154
diff --git a/CORE/MAC/src/pe/lim/limProcessTdls.c b/CORE/MAC/src/pe/lim/limProcessTdls.c
index 2afbfb8..f79491b 100644
--- a/CORE/MAC/src/pe/lim/limProcessTdls.c
+++ b/CORE/MAC/src/pe/lim/limProcessTdls.c
@@ -92,11 +92,6 @@
#define MIN_IEEE_8023_SIZE 46
#define MIN_VENDOR_SPECIFIC_IE_SIZE 5
#endif
-#ifdef WLAN_FEATURE_TDLS_DEBUG
-#define TDLS_DEBUG_LOG_LEVEL VOS_TRACE_LEVEL_ERROR
-#else
-#define TDLS_DEBUG_LOG_LEVEL VOS_TRACE_LEVEL_INFO
-#endif
#ifdef FEATURE_WLAN_TDLS_INTERNAL
@@ -499,11 +494,12 @@
(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],
- pMacHdr->addr3[0], pMacHdr->addr3[1], pMacHdr->addr3[2], pMacHdr->addr3[3], pMacHdr->addr3[4], pMacHdr->addr3[5]));
+ limLog(pMac, LOG1,
+ FL("Preparing TDLS frame header to %s A1:"MAC_ADDRESS_STR", A2:"MAC_ADDRESS_STR", A3:"MAC_ADDRESS_STR),
+ (tdlsLinkType == TDLS_LINK_AP) ? "AP" : "DIRECT",
+ MAC_ADDR_ARRAY(pMacHdr->addr1),
+ MAC_ADDR_ARRAY(pMacHdr->addr2),
+ MAC_ADDR_ARRAY(pMacHdr->addr3));
//printMacAddr(pMacHdr->bssId) ;
//printMacAddr(pMacHdr->sa) ;
@@ -544,8 +540,8 @@
psessionEntry = peFindSessionBySessionId(pMac, pMac->lim.mgmtFrameSessionId);
if (NULL == psessionEntry)
{
- VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_ERROR,
- ("%s: sessionID %d is not found"), __func__, pMac->lim.mgmtFrameSessionId);
+ limLog(pMac, LOGE, FL("sessionID %d is not found"),
+ pMac->lim.mgmtFrameSessionId);
return eHAL_STATUS_FAILURE;
}
limSendSmeMgmtTXCompletion(pMac, psessionEntry, txCompleteSuccess);
@@ -601,16 +597,17 @@
status = dot11fGetPackedTDLSDisReqSize( pMac, &tdlsDisReq, &nPayload);
if ( DOT11F_FAILED( status ) )
{
- limLog( pMac, LOGP, FL("Failed to calculate the packed size f"
- "or a discovery Request (0x%08x)."), status );
+ limLog(pMac, LOGE,
+ FL("Failed to calculate the packed size for a discovery Request (0x%08x)."),
+ status);
/* We'll fall back on the worst case scenario: */
nPayload = sizeof( tDot11fTDLSDisReq );
}
else if ( DOT11F_WARNED( status ) )
{
- limLog( pMac, LOGW, FL("There were warnings while calculating "
- "the packed size for a discovery Request ("
- "0x%08x)."), status );
+ limLog(pMac, LOGW,
+ FL("There were warnings while calculating the packed size for a discovery Request (0x%08x)."),
+ status);
}
/*
@@ -649,8 +646,9 @@
( void** ) &pPacket );
if ( ! HAL_STATUS_SUCCESS ( halstatus ) )
{
- limLog( pMac, LOGP, FL("Failed to allocate %d bytes for a TDLS"
- "Discovery Request."), nBytes );
+ limLog(pMac, LOGE,
+ FL("Failed to allocate %d bytes for a TDLS Discovery Request."),
+ nBytes);
return eSIR_MEM_ALLOC_FAILED;
}
@@ -682,16 +680,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)."), status );
+ limLog(pMac, LOGW, FL("There were warnings while packing TDLS Discovery Request (0x%08x)."),
+ status);
}
#ifndef NO_PAD_TDLS_MIN_8023_SIZE
@@ -706,8 +704,7 @@
padVendorSpecific[3] = 0xA0;
padVendorSpecific[4] = 0xC6;
- LIM_LOG_TDLS(VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_INFO, ("Padding Vendor Specific Ie Len = %d"),
- padLen ));
+ limLog(pMac, LOG1, FL("Padding Vendor Specific Ie Len = %d"), padLen);
/* padding zero if more than 5 bytes are required */
if (padLen > MIN_VENDOR_SPECIFIC_IE_SIZE)
@@ -716,8 +713,11 @@
}
#endif
- LIM_LOG_TDLS(VOS_TRACE(VOS_MODULE_ID_PE, TDLS_DEBUG_LOG_LEVEL, ("[TDLS] action %d (%s) -AP-> OTA "),
- SIR_MAC_TDLS_DIS_REQ, limTraceTdlsActionString(SIR_MAC_TDLS_DIS_REQ) ));
+ limLog(pMac, LOG1,
+ FL("[TDLS] action %d (%s) -AP-> OTA peer="MAC_ADDRESS_STR),
+ SIR_MAC_TDLS_DIS_REQ,
+ limTraceTdlsActionString(SIR_MAC_TDLS_DIS_REQ),
+ MAC_ADDR_ARRAY(peer_mac));
halstatus = halTxFrameWithTxComplete( pMac, pPacket, ( tANI_U16 ) nBytes,
HAL_TXRX_FRM_802_11_DATA,
@@ -729,7 +729,7 @@
if ( ! HAL_STATUS_SUCCESS ( halstatus ) )
{
pMac->lim.mgmtFrameSessionId = 0xff;
- limLog( pMac, LOGE, FL("could not send TDLS Dis Request frame!" ));
+ limLog(pMac, LOGE, FL("could not send TDLS Discovery Request frame"));
return eSIR_FAILURE;
}
pMac->lim.mgmtFrameSessionId = psessionEntry->peSessionId;
@@ -1089,8 +1089,7 @@
* Could not get Capabilities value
* from CFG. Log error.
*/
- limLog(pMac, LOGP,
- FL("could not retrieve Capabilities value"));
+ limLog(pMac, LOGP, FL("could not retrieve Capabilities value"));
}
swapBitField16(caps, ( tANI_U16* )&tdlsDisRsp.Capabilities );
@@ -1128,16 +1127,17 @@
status = dot11fGetPackedTDLSDisRspSize( pMac, &tdlsDisRsp, &nPayload);
if ( DOT11F_FAILED( status ) )
{
- limLog( pMac, LOGP, FL("Failed to calculate the packed size f"
- "or a discovery Request (0x%08x)."), status );
+ limLog(pMac, LOGE,
+ FL("Failed to calculate the packed size for a Discovery Response (0x%08x)."),
+ status);
/* We'll fall back on the worst case scenario: */
nPayload = sizeof( tDot11fProbeRequest );
}
else if ( DOT11F_WARNED( status ) )
{
- limLog( pMac, LOGW, FL("There were warnings while calculating "
- "the packed size for a discovery Request ("
- "0x%08x)."), status );
+ limLog(pMac, LOGW,
+ FL("There were warnings while calculating the packed size for a Discovery Response (0x%08x)."),
+ status);
}
/*
@@ -1156,8 +1156,9 @@
( void** ) &pPacket );
if ( ! HAL_STATUS_SUCCESS ( halstatus ) )
{
- limLog( pMac, LOGP, FL("Failed to allocate %d bytes for a TDLS"
- "Discovery Request."), nBytes );
+ limLog(pMac, LOGE,
+ FL("Failed to allocate %d bytes for a TDLS Discovery Response."),
+ nBytes);
return eSIR_MEM_ALLOC_FAILED;
}
@@ -1203,16 +1204,18 @@
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 Response (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)."), status );
+ limLog( pMac, LOGW,
+ FL("There were warnings while packing TDLS Discovery Request (0x%08x)."),
+ status);
}
#if 0
@@ -1230,17 +1233,15 @@
#endif
if (0 != addIeLen)
{
- LIM_LOG_TDLS(VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_ERROR,
- ("Copy Additional Ie Len = %d"), addIeLen ));
+ limLog(pMac, LOG1, FL("Copy Additional Ie Len = %d"), addIeLen);
vos_mem_copy(pFrame + sizeof(tSirMacMgmtHdr) + nPayload, addIe,
addIeLen);
}
- VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_INFO,
- ("transmitting Discovery response on direct link")) ;
-
- LIM_LOG_TDLS(VOS_TRACE(VOS_MODULE_ID_PE, TDLS_DEBUG_LOG_LEVEL, ("[TDLS] action %d (%s) -DIRECT-> OTA"),
- SIR_MAC_TDLS_DIS_RSP, limTraceTdlsActionString(SIR_MAC_TDLS_DIS_RSP) ));
-
+ limLog(pMac, LOG1,
+ FL("[TDLS] action %d (%s) -DIRECT-> OTA peer="MAC_ADDRESS_STR),
+ SIR_MAC_TDLS_DIS_RSP,
+ limTraceTdlsActionString(SIR_MAC_TDLS_DIS_RSP),
+ MAC_ADDR_ARRAY(peerMac));
/*
* Transmit Discovery response and watch if this is delivered to
@@ -1256,7 +1257,7 @@
if ( ! HAL_STATUS_SUCCESS ( halstatus ) )
{
pMac->lim.mgmtFrameSessionId = 0xff;
- limLog( pMac, LOGE, FL("could not send TDLS Dis Request frame!" ));
+ limLog(pMac, LOGE, FL("could not send TDLS Discovery Response frame!"));
return eSIR_FAILURE;
}
pMac->lim.mgmtFrameSessionId = psessionEntry->peSessionId;
@@ -1293,15 +1294,15 @@
else
{
Aid->present = 0;
- limLog( pMac, LOGE, FL("pStaDs is NULL for " MAC_ADDRESS_STR ),
- MAC_ADDR_ARRAY(peerMac));
+ limLog(pMac, LOGE, FL("pStaDs is NULL for " MAC_ADDRESS_STR),
+ MAC_ADDR_ARRAY(peerMac));
}
}
}
else
{
Aid->present = 0;
- limLog( pMac, LOGW, FL("Vht not enable from ini for 2.4GHz."));
+ limLog(pMac, LOGW, FL("Vht not enable from ini for 2.4GHz."));
}
}
@@ -1349,8 +1350,7 @@
* Could not get Capabilities value
* from CFG. Log error.
*/
- limLog(pMac, LOGP,
- FL("could not retrieve Capabilities value"));
+ limLog(pMac, LOGE, FL("could not retrieve Capabilities value"));
}
swapBitField16(caps, ( tANI_U16* )&tdlsSetupReq.Capabilities );
@@ -1381,6 +1381,7 @@
/* Populate QOS info, needed for Peer U-APSD session */
/* TODO: Now hardcoded, because PopulateDot11fQOSCapsStation() depends on AP's capability, and
TDLS doesn't want to depend on AP's capability */
+ limLog(pMac, LOG1, FL("populate QOS IE in Setup Request Frame"));
tdlsSetupReq.QOSCapsStation.present = 1;
tdlsSetupReq.QOSCapsStation.max_sp_length = 0;
tdlsSetupReq.QOSCapsStation.qack = 0;
@@ -1425,16 +1426,17 @@
&nPayload);
if ( DOT11F_FAILED( status ) )
{
- limLog( pMac, LOGP, FL("Failed to calculate the packed size f"
- "or a discovery Request (0x%08x)."), status );
+ limLog(pMac, LOGE,
+ FL("Failed to calculate the packed size for a Setup Request (0x%08x)."),
+ status);
/* We'll fall back on the worst case scenario: */
nPayload = sizeof( tDot11fProbeRequest );
}
else if ( DOT11F_WARNED( status ) )
{
- limLog( pMac, LOGW, FL("There were warnings while calculating "
- "the packed size for a discovery Request ("
- "0x%08x)."), status );
+ limLog(pMac, LOGW,
+ FL("There were warnings while calculating the packed size for a Setup Request (0x%08x)."),
+ status);
}
@@ -1458,8 +1460,9 @@
( void** ) &pPacket );
if ( ! HAL_STATUS_SUCCESS ( halstatus ) )
{
- limLog( pMac, LOGP, FL("Failed to allocate %d bytes for a TDLS"
- "Discovery Request."), nBytes );
+ limLog(pMac, LOGE,
+ FL("Failed to allocate %d bytes for a TDLS Setup Request."),
+ nBytes);
return eSIR_MEM_ALLOC_FAILED;
}
@@ -1486,25 +1489,29 @@
MAC_ADDR_ARRAY(tdlsSetupReq.LinkIdentifier.bssid));
}
#endif
- limLog( pMac, LOGW, FL("%s: SupportedChnlWidth %x rxMCSMap %x rxMCSMap %x txSupDataRate %x"),
- __func__, tdlsSetupReq.VHTCaps.supportedChannelWidthSet, tdlsSetupReq.VHTCaps.rxMCSMap,
- tdlsSetupReq.VHTCaps.txMCSMap, tdlsSetupReq.VHTCaps.txSupDataRate );
+ limLog( pMac, LOGW, FL("SupportedChnlWidth %x rxMCSMap %x rxMCSMap %x txSupDataRate %x"),
+ tdlsSetupReq.VHTCaps.supportedChannelWidthSet,
+ tdlsSetupReq.VHTCaps.rxMCSMap,
+ tdlsSetupReq.VHTCaps.txMCSMap,
+ tdlsSetupReq.VHTCaps.txSupDataRate);
status = dot11fPackTDLSSetupReq( pMac, &tdlsSetupReq, pFrame
+ header_offset, nPayload, &nPayload );
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 Setup Request (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)."), status );
+ limLog(pMac, LOGW,
+ FL("There were warnings while packing TDLS Setup Request (0x%08x)."),
+ status);
}
//Copy the additional IE.
@@ -1513,13 +1520,15 @@
//if there is any IOT issue.
if( addIeLen != 0 )
{
- LIM_LOG_TDLS(VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_ERROR, ("Copy Additional Ie Len = %d"),
- addIeLen ));
- vos_mem_copy( pFrame + header_offset + nPayload, addIe, addIeLen );
+ limLog(pMac, LOG1, FL("Copy Additional Ie Len = %d"),
+ addIeLen);
+ vos_mem_copy( pFrame + header_offset + nPayload, addIe, addIeLen );
}
- LIM_LOG_TDLS(VOS_TRACE(VOS_MODULE_ID_PE, TDLS_DEBUG_LOG_LEVEL, ("[TDLS] action %d (%s) -AP-> OTA"),
- SIR_MAC_TDLS_SETUP_REQ, limTraceTdlsActionString(SIR_MAC_TDLS_SETUP_REQ) ));
+ limLog(pMac, LOG1, FL("[TDLS] action %d (%s) -AP-> OTA peer="MAC_ADDRESS_STR),
+ SIR_MAC_TDLS_SETUP_REQ,
+ limTraceTdlsActionString(SIR_MAC_TDLS_SETUP_REQ),
+ MAC_ADDR_ARRAY(peerMac));
halstatus = halTxFrameWithTxComplete( pMac, pPacket, ( tANI_U16 ) nBytes,
HAL_TXRX_FRM_802_11_DATA,
@@ -1532,7 +1541,7 @@
if ( ! HAL_STATUS_SUCCESS ( halstatus ) )
{
pMac->lim.mgmtFrameSessionId = 0xff;
- limLog( pMac, LOGE, FL("could not send TDLS Dis Request frame!" ));
+ limLog(pMac, LOGE, FL("could not send TDLS Setup Request frame!"));
return eSIR_FAILURE;
}
pMac->lim.mgmtFrameSessionId = psessionEntry->peSessionId;
@@ -1571,34 +1580,29 @@
PopulateDot11fLinkIden( pMac, psessionEntry, &teardown.LinkIdentifier,
peerMac, (responder == TRUE) ? TDLS_RESPONDER : TDLS_INITIATOR) ;
-
-
/*
* now we pack it. First, how much space are we going to need?
*/
status = dot11fGetPackedTDLSTeardownSize( pMac, &teardown, &nPayload);
if ( DOT11F_FAILED( status ) )
{
- limLog( pMac, LOGP, FL("Failed to calculate the packed size f"
- "or a discovery Request (0x%08x)."), status );
+ limLog(pMac, LOGE,
+ FL("Failed to calculate the packed size for Teardown frame (0x%08x)."),
+ status);
/* We'll fall back on the worst case scenario: */
nPayload = sizeof( tDot11fProbeRequest );
}
else if ( DOT11F_WARNED( status ) )
{
- limLog( pMac, LOGW, FL("There were warnings while calculating "
- "the packed size for a discovery Request ("
- "0x%08x)."), status );
+ limLog(pMac, LOGW,
+ FL("There were warnings while calculating the packed size for Teardown frame (0x%08x)."),
+ status);
}
-
-
/*
* This frame is going out from PE as data frames with special ethertype
* 89-0d.
* 8 bytes of RFC 1042 header
*/
-
-
nBytes = nPayload + ((IS_QOS_ENABLED(psessionEntry))
? sizeof(tSirMacDataHdr3a) : sizeof(tSirMacMgmtHdr))
+ sizeof( eth_890d_header )
@@ -1629,8 +1633,9 @@
( void** ) &pPacket );
if ( ! HAL_STATUS_SUCCESS ( halstatus ) )
{
- limLog( pMac, LOGP, FL("Failed to allocate %d bytes for a TDLS"
- "Discovery Request."), nBytes );
+ limLog(pMac, LOGE,
+ FL("Failed to allocate %d bytes for a TDLS Teardown Frame."),
+ nBytes);
return eSIR_MEM_ALLOC_FAILED;
}
@@ -1641,7 +1646,7 @@
* IE formation, memory allocation is completed, Now form TDLS discovery
* request frame
*/
-
+ limLog(pMac, LOGE, FL("Reason of TDLS Teardown: %d"), reason);
/* fill out the buffer descriptor */
header_offset = limPrepareTdlsFrameHeader(pMac, pFrame,
@@ -1657,15 +1662,15 @@
if ( DOT11F_FAILED( status ) )
{
limLog( pMac, LOGE, FL("Failed to pack a TDLS Teardown req (0x%08x)."),
- status );
+ 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)."), status );
+ limLog(pMac, LOGW, FL("There were warnings while packing TDLS Teardown frame (0x%08x)."),
+ status);
}
#if 0
if(pMac->hal.pCBackFnTxComp == NULL)
@@ -1687,9 +1692,8 @@
if( addIeLen != 0 )
{
- LIM_LOG_TDLS(VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_ERROR, ("Copy Additional Ie Len = %d"),
- addIeLen ));
- vos_mem_copy( pFrame + header_offset + nPayload, addIe, addIeLen );
+ limLog(pMac, LOG1, FL("Copy Additional Ie Len = %d"), addIeLen);
+ vos_mem_copy( pFrame + header_offset + nPayload, addIe, addIeLen );
}
#ifndef NO_PAD_TDLS_MIN_8023_SIZE
@@ -1704,8 +1708,7 @@
padVendorSpecific[3] = 0xA0;
padVendorSpecific[4] = 0xC6;
- LIM_LOG_TDLS(VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_INFO, ("Padding Vendor Specific Ie Len = %d"),
- padLen ));
+ limLog(pMac, LOG1, FL("Padding Vendor Specific Ie Len = %d"), padLen);
/* padding zero if more than 5 bytes are required */
if (padLen > MIN_VENDOR_SPECIFIC_IE_SIZE)
@@ -1713,9 +1716,12 @@
padLen - MIN_VENDOR_SPECIFIC_IE_SIZE, 0);
}
#endif
- LIM_LOG_TDLS(VOS_TRACE(VOS_MODULE_ID_PE, TDLS_DEBUG_LOG_LEVEL, ("[TDLS] action %d (%s) -%s-> OTA"),
- SIR_MAC_TDLS_TEARDOWN, limTraceTdlsActionString(SIR_MAC_TDLS_TEARDOWN),
- (reason == eSIR_MAC_TDLS_TEARDOWN_PEER_UNREACHABLE) ? "AP": "DIRECT" ));
+ limLog(pMac, LOG1, FL("[TDLS] action %d (%s) -%s-> OTA peer="MAC_ADDRESS_STR),
+ SIR_MAC_TDLS_TEARDOWN,
+ limTraceTdlsActionString(SIR_MAC_TDLS_TEARDOWN),
+ ((reason == eSIR_MAC_TDLS_TEARDOWN_PEER_UNREACHABLE) ?
+ "AP": "DIRECT"),
+ MAC_ADDR_ARRAY(peerMac));
halstatus = halTxFrameWithTxComplete( pMac, pPacket, ( tANI_U16 ) nBytes,
HAL_TXRX_FRM_802_11_DATA,
@@ -1727,7 +1733,7 @@
if ( ! HAL_STATUS_SUCCESS ( halstatus ) )
{
pMac->lim.mgmtFrameSessionId = 0xff;
- limLog( pMac, LOGE, FL("could not send TDLS Dis Request frame!" ));
+ limLog(pMac, LOGE, FL("could not send TDLS Teardown frame"));
return eSIR_FAILURE;
}
@@ -1782,8 +1788,7 @@
* Could not get Capabilities value
* from CFG. Log error.
*/
- limLog(pMac, LOGP,
- FL("could not retrieve Capabilities value"));
+ limLog(pMac, LOGE, FL("could not retrieve Capabilities value"));
}
swapBitField16(caps, ( tANI_U16* )&tdlsSetupRsp.Capabilities );
@@ -1814,6 +1819,7 @@
/* Populate QOS info, needed for Peer U-APSD session */
/* TODO: Now hardcoded, because PopulateDot11fQOSCapsStation() depends on AP's capability, and
TDLS doesn't want to depend on AP's capability */
+ limLog(pMac, LOG1, FL("populate QOS IE in Setup Response frame"));
tdlsSetupRsp.QOSCapsStation.present = 1;
tdlsSetupRsp.QOSCapsStation.max_sp_length = 0;
tdlsSetupRsp.QOSCapsStation.qack = 0;
@@ -1853,16 +1859,17 @@
&nPayload);
if ( DOT11F_FAILED( status ) )
{
- limLog( pMac, LOGP, FL("Failed to calculate the packed size f"
- "or a discovery Request (0x%08x)."), status );
+ limLog(pMac, LOGE,
+ FL("Failed to calculate the packed size for a Setup Response (0x%08x)."),
+ status);
/* We'll fall back on the worst case scenario: */
nPayload = sizeof( tDot11fProbeRequest );
}
else if ( DOT11F_WARNED( status ) )
{
- limLog( pMac, LOGW, FL("There were warnings while calculating "
- "the packed size for a discovery Request ("
- "0x%08x)."), status );
+ limLog(pMac, LOGW,
+ FL("There were warnings while calculating the packed size for Setup Response (0x%08x)."),
+ status);
}
/*
@@ -1885,8 +1892,9 @@
( void** ) &pPacket );
if ( ! HAL_STATUS_SUCCESS ( halstatus ) )
{
- limLog( pMac, LOGP, FL("Failed to allocate %d bytes for a TDLS"
- "Discovery Request."), nBytes );
+ limLog(pMac, LOGE,
+ FL("Failed to allocate %d bytes for a TDLS Setup Response."),
+ nBytes);
return eSIR_MEM_ALLOC_FAILED;
}
@@ -1915,24 +1923,28 @@
MAC_ADDR_ARRAY(tdlsSetupRsp.LinkIdentifier.bssid));
}
#endif
- limLog( pMac, LOGW, FL("%s: SupportedChnlWidth %x rxMCSMap %x rxMCSMap %x txSupDataRate %x"),
- __func__, tdlsSetupRsp.VHTCaps.supportedChannelWidthSet, tdlsSetupRsp.VHTCaps.rxMCSMap,
- tdlsSetupRsp.VHTCaps.txMCSMap, tdlsSetupRsp.VHTCaps.txSupDataRate );
+ limLog(pMac, LOG1,
+ FL("SupportedChnlWidth %x rxMCSMap %x rxMCSMap %x txSupDataRate %x"),
+ tdlsSetupRsp.VHTCaps.supportedChannelWidthSet,
+ tdlsSetupRsp.VHTCaps.rxMCSMap,
+ tdlsSetupRsp.VHTCaps.txMCSMap,
+ tdlsSetupRsp.VHTCaps.txSupDataRate);
status = dot11fPackTDLSSetupRsp( pMac, &tdlsSetupRsp, pFrame
+ header_offset, nPayload, &nPayload );
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 Setup Response (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)."), status );
+ limLog(pMac, LOGW,
+ FL("There were warnings while packing TDLS Setup Response (0x%08x)."),
+ status);
}
//Copy the additional IE.
@@ -1944,8 +1956,11 @@
vos_mem_copy( pFrame + header_offset + nPayload, addIe, addIeLen );
}
- LIM_LOG_TDLS(VOS_TRACE(VOS_MODULE_ID_PE, TDLS_DEBUG_LOG_LEVEL, ("[TDLS] action %d (%s) -AP-> OTA"),
- SIR_MAC_TDLS_SETUP_RSP, limTraceTdlsActionString(SIR_MAC_TDLS_SETUP_RSP) ));
+ limLog(pMac, LOG1,
+ FL("[TDLS] action %d (%s) -AP-> OTA peer="MAC_ADDRESS_STR),
+ SIR_MAC_TDLS_SETUP_RSP,
+ limTraceTdlsActionString(SIR_MAC_TDLS_SETUP_RSP),
+ MAC_ADDR_ARRAY(peerMac));
halstatus = halTxFrameWithTxComplete( pMac, pPacket, ( tANI_U16 ) nBytes,
HAL_TXRX_FRM_802_11_DATA,
@@ -1958,7 +1973,7 @@
if ( ! HAL_STATUS_SUCCESS ( halstatus ) )
{
pMac->lim.mgmtFrameSessionId = 0xff;
- limLog( pMac, LOGE, FL("could not send TDLS Dis Request frame!" ));
+ limLog(pMac, LOGE, FL("could not send TDLS Setup Response"));
return eSIR_FAILURE;
}
pMac->lim.mgmtFrameSessionId = psessionEntry->peSessionId;
@@ -2018,6 +2033,7 @@
/* Check self and peer WMM capable */
if ((1 == pMac->lim.gLimTDLSWmmMode) && (CHECK_BIT(peerCapability, TDLS_PEER_WMM_CAP)))
{
+ limLog(pMac, LOG1, FL("populate WMM praram in Setup Confirm"));
PopulateDot11fWMMParams(pMac, &tdlsSetupCnf.WMMParams, psessionEntry);
}
@@ -2046,16 +2062,17 @@
&nPayload);
if ( DOT11F_FAILED( status ) )
{
- limLog( pMac, LOGP, FL("Failed to calculate the packed size f"
- "or a discovery Request (0x%08x)."), status );
+ limLog(pMac, LOGE,
+ FL("Failed to calculate the packed size for Setup Confirm (0x%08x)."),
+ status);
/* We'll fall back on the worst case scenario: */
nPayload = sizeof( tDot11fProbeRequest );
}
else if ( DOT11F_WARNED( status ) )
{
- limLog( pMac, LOGW, FL("There were warnings while calculating "
- "the packed size for a discovery Request ("
- "0x%08x)."), status );
+ limLog(pMac, LOGW,
+ FL("There were warnings while calculating the packed size for Setup Confirm (0x%08x)."),
+ status);
}
/*
@@ -2096,8 +2113,9 @@
( void** ) &pPacket );
if ( ! HAL_STATUS_SUCCESS ( halstatus ) )
{
- limLog( pMac, LOGP, FL("Failed to allocate %d bytes for a TDLS"
- "Discovery Request."), nBytes );
+ limLog(pMac, LOGE,
+ FL("Failed to allocate %d bytes for a TDLS Setup Confirm."),
+ nBytes);
return eSIR_MEM_ALLOC_FAILED;
}
@@ -2127,16 +2145,18 @@
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 Setup Confirm (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)."), status );
+ limLog(pMac, LOGW,
+ FL("There were warnings while packing TDLS Setup Confirm (0x%08x)."),
+ status);
}
#if 0
if(pMac->hal.pCBackFnTxComp == NULL)
@@ -2176,8 +2196,7 @@
padVendorSpecific[3] = 0xA0;
padVendorSpecific[4] = 0xC6;
- LIM_LOG_TDLS(VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_INFO, ("Padding Vendor Specific Ie Len = %d"),
- padLen ));
+ limLog(pMac, LOG1, FL("Padding Vendor Specific Ie Len = %d"), padLen);
/* padding zero if more than 5 bytes are required */
if (padLen > MIN_VENDOR_SPECIFIC_IE_SIZE)
@@ -2187,8 +2206,11 @@
#endif
- LIM_LOG_TDLS(VOS_TRACE(VOS_MODULE_ID_PE, TDLS_DEBUG_LOG_LEVEL, ("[TDLS] action %d (%s) -AP-> OTA"),
- SIR_MAC_TDLS_SETUP_CNF, limTraceTdlsActionString(SIR_MAC_TDLS_SETUP_CNF) ));
+ limLog(pMac, LOG1,
+ FL("[TDLS] action %d (%s) -AP-> OTA peer="MAC_ADDRESS_STR),
+ SIR_MAC_TDLS_SETUP_CNF,
+ limTraceTdlsActionString(SIR_MAC_TDLS_SETUP_CNF),
+ MAC_ADDR_ARRAY(peerMac));
halstatus = halTxFrameWithTxComplete( pMac, pPacket, ( tANI_U16 ) nBytes,
HAL_TXRX_FRM_802_11_DATA,
@@ -2202,7 +2224,7 @@
if ( ! HAL_STATUS_SUCCESS ( halstatus ) )
{
pMac->lim.mgmtFrameSessionId = 0xff;
- limLog( pMac, LOGE, FL("could not send TDLS Dis Request frame!" ));
+ limLog(pMac, LOGE, FL("could not send TDLS Setup Confirm frame"));
return eSIR_FAILURE;
}
@@ -2437,9 +2459,14 @@
pDot11f->shortGI40MHz = 0;
}
- dot11fLog(pMac, LOG2, FL("SupportedChnlWidth: %d, mimoPS: %d, GF: %d, shortGI20:%d, shortGI40: %d, dsssCck: %d"),
- pDot11f->supportedChannelWidthSet, pDot11f->mimoPowerSave, pDot11f->greenField,
- pDot11f->shortGI20MHz, pDot11f->shortGI40MHz, pDot11f->dsssCckMode40MHz);
+ limLog(pMac, LOG1,
+ FL("SupportedChnlWidth: %d, mimoPS: %d, GF: %d, shortGI20:%d, shortGI40: %d, dsssCck: %d"),
+ pDot11f->supportedChannelWidthSet,
+ pDot11f->mimoPowerSave,
+ pDot11f->greenField,
+ pDot11f->shortGI20MHz,
+ pDot11f->shortGI40MHz,
+ pDot11f->dsssCckMode40MHz);
nCfgValue = pTdlsAddStaReq->htCap.ampduParamsInfo;
@@ -2450,7 +2477,7 @@
pDot11f->mpduDensity = pHTParametersInfo->mpduDensity;
pDot11f->reserved1 = pHTParametersInfo->reserved;
- dot11fLog( pMac, LOG2, FL( "AMPDU Param: %x" ), nCfgValue);
+ limLog(pMac, LOG1, FL("AMPDU Param: %x"), nCfgValue);
vos_mem_copy( pDot11f->supportedMCSSet, pTdlsAddStaReq->htCap.suppMcsSet,
SIZE_OF_SUPPORTED_MCS_SET);
@@ -2592,7 +2619,7 @@
&val) != eSIR_SUCCESS)
{
/// Could not get rateset from CFG. Log error.
- limLog(pMac, LOGP, FL("could not retrieve rateset"));
+ limLog(pMac, LOGE, FL("could not retrieve rateset"));
val = 0;
}
tempRateSet.numRates = val;
@@ -2610,7 +2637,7 @@
if ((tempRateSet.numRates + tempRateSet2.numRates) > 12)
{
- PELOGE(limLog(pMac, LOGE, FL("more than 12 rates in CFG"));)
+ limLog(pMac, LOGE, FL("more than 12 rates in CFG"));
goto error;
}
@@ -2655,9 +2682,9 @@
*/
if (supporteRatesLength > SIR_MAC_RATESET_EID_MAX)
{
- limLog( pMac, LOGW, FL("Supported rates length %d more than "
- "the Max limit, reset to Max"),
- supporteRatesLength);
+ limLog(pMac, LOGW,
+ FL("Supported rates length %d more than the Max limit, reset to Max"),
+ supporteRatesLength);
supporteRatesLength = SIR_MAC_RATESET_EID_MAX;
}
for (i = 0; i < supporteRatesLength; i++)
@@ -2683,7 +2710,8 @@
if ((bRateIndex > HAL_NUM_11B_RATES) || (aRateIndex > HAL_NUM_11A_RATES))
{
limLog(pMac, LOGE, FL("Invalid number of rates (11b->%d, 11a->%d)"),
- bRateIndex, aRateIndex);
+ bRateIndex,
+ aRateIndex);
return eSIR_FAILURE;
}
#endif
@@ -2722,10 +2750,12 @@
for (i=0; i<val; i++)
pStaDs->supportedRates.supportedMCSSet[i] = mcsSet[i] & pSupportedMCSSet[i];
- PELOG2(limLog(pMac, LOG2, FL("limPopulateMatchingRateSet: MCS Rate Set Bitmap from CFG and DPH :"));)
+ limLog(pMac, LOG1, FL("MCS Rate Set Bitmap from CFG and DPH:"));
for (i=0; i<SIR_MAC_MAX_SUPPORTED_MCS_SET; i++)
{
- PELOG2(limLog(pMac, LOG2,FL("%x %x "), mcsSet[i], pStaDs->supportedRates.supportedMCSSet[i]);)
+ limLog(pMac, LOG1, FL("%x %x"),
+ mcsSet[i],
+ pStaDs->supportedRates.supportedMCSSet[i]);
}
}
@@ -3104,9 +3134,9 @@
}
else if ( DOT11F_WARNED( status ) )
{
- limLog( pMac, LOGW, FL("There were warnings while unpacking a TDLS "
+ limLog(pMac, LOGW, FL("There were warnings while unpacking a TDLS "
"discovery Request frame (0x%08x, %d bytes):"),
- status, frmLen );
+ status, frmLen);
PELOG2(sirDumpBuf(pMac, SIR_DBG_MODULE_ID, LOG2, pBody, frmLen);)
}
@@ -3139,7 +3169,7 @@
MAC_ADDR_ARRAY(tdlsDisReq.LinkIdentifier.bssid));
if(!status)
{
- limLog( pMac, LOGE, FL("TDLS discovery request frame from other BSS -> something wrong. Check RXP filter")) ;
+ limLog(pMac, LOGE, FL("TDLS discovery request frame from other BSS -> something wrong. Check RXP filter")) ;
return eSIR_FAILURE ;
}
@@ -4268,18 +4298,16 @@
if( !aid )
{
- VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_ERROR,
- ("%s: No more free AID for peer " MAC_ADDRESS_STR),
- __func__, MAC_ADDR_ARRAY(pAddStaReq->peerMac)) ;
+ limLog(pMac, LOGE, FL("No more free AID for peer " MAC_ADDRESS_STR),
+ MAC_ADDR_ARRAY(pAddStaReq->peerMac));
return eSIR_FAILURE;
}
/* Set the aid in peerAIDBitmap as it has been assigned to TDLS peer */
SET_PEER_AID_BITMAP(psessionEntry->peerAIDBitmap, aid);
- VOS_TRACE(VOS_MODULE_ID_PE, TDLS_DEBUG_LOG_LEVEL,
- ("limTdlsSetupAddSta: Aid = %d, for peer =" MAC_ADDRESS_STR),
- aid, MAC_ADDR_ARRAY(pAddStaReq->peerMac));
+ limLog(pMac, LOG1, FL("Aid = %d, for peer =" MAC_ADDRESS_STR),
+ aid, MAC_ADDR_ARRAY(pAddStaReq->peerMac));
pStaDs = dphGetHashEntry(pMac, aid, &psessionEntry->dph.dphHashTable);
if (pStaDs)
@@ -4293,8 +4321,7 @@
if(NULL == pStaDs)
{
- VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_ERROR,
- (" add hash entry failed")) ;
+ limLog(pMac, LOGE, FL("add hash entry failed"));
VOS_ASSERT(0) ;
return eSIR_FAILURE;
}
@@ -4330,13 +4357,11 @@
if(pStaDs)
{
- VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_INFO,
- ("DEL STA peer MAC: "MAC_ADDRESS_STR),
- MAC_ADDR_ARRAY(pStaDs->staAddr));
-
- VOS_TRACE(VOS_MODULE_ID_PE, TDLS_DEBUG_LOG_LEVEL,
- ("limTdlsDelSta: STA type = %x, sta idx = %x"),pStaDs->staType,
- pStaDs->staIndex) ;
+ limLog(pMac, LOG1, FL("DEL STA peer MAC: "MAC_ADDRESS_STR),
+ MAC_ADDR_ARRAY(pStaDs->staAddr));
+ limLog(pMac, LOG1, FL("STA type = %x, sta idx = %x"),
+ pStaDs->staType,
+ pStaDs->staIndex);
status = limDelSta(pMac, pStaDs, false, psessionEntry) ;
#ifdef FEATURE_WLAN_TDLS_INTERNAL
@@ -4910,7 +4935,7 @@
addStaRsp = vos_mem_malloc(sizeof(tSirTdlsAddStaRsp));
if ( NULL == addStaRsp )
{
- PELOGE(limLog(pMac, LOGE, FL("Failed to allocate memory"));)
+ limLog(pMac, LOGE, FL("Failed to allocate memory"));
return eSIR_FAILURE;
}
@@ -4954,15 +4979,14 @@
tANI_U16 aid = 0 ;
SET_LIM_PROCESS_DEFD_MESGS(pMac, true);
- VOS_TRACE(VOS_MODULE_ID_PE, TDLS_DEBUG_LOG_LEVEL,
- ("limTdlsAddStaRsp: staIdx=%d, staMac="MAC_ADDRESS_STR), pAddStaParams->staIdx,
- MAC_ADDR_ARRAY(pAddStaParams->staMac));
+ limLog(pMac, LOG1, FL("staIdx=%d, staMac="MAC_ADDRESS_STR),
+ pAddStaParams->staIdx,
+ MAC_ADDR_ARRAY(pAddStaParams->staMac));
if (pAddStaParams->status != eHAL_STATUS_SUCCESS)
{
VOS_ASSERT(0) ;
- VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_ERROR,
- ("Add sta failed ")) ;
+ limLog(pMac, LOGE, FL("Add sta failed "));
status = eSIR_FAILURE;
goto add_sta_error;
}
@@ -4971,8 +4995,7 @@
&psessionEntry->dph.dphHashTable);
if(NULL == pStaDs)
{
- VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_ERROR,
- ("pStaDs is NULL ")) ;
+ limLog(pMac, LOGE, FL("pStaDs is NULL "));
status = eSIR_FAILURE;
goto add_sta_error;
}
@@ -5042,8 +5065,7 @@
* Could not get Valid channel list from CFG.
* Log error.
*/
- limLog(pMac, LOGP,
- FL("could not retrieve Valid channel list"));
+ limLog(pMac, LOGE, FL("could not retrieve valid channel list"));
}
suppChannels->num_bands = (tANI_U8) numChans;
@@ -5060,14 +5082,19 @@
psessionEntry->htSecondaryChannelOffset);
if (op_class == 0)
{
- PELOGE(limLog(pMac, LOGE, FL("Present Operating class is Wrong!!!"));)
+ limLog(pMac, LOGE,
+ FL("Present Operating class is wrong, countryCodeCurrent: %s, currentOperChannel: %d, htSecondaryChannelOffset: %d"),
+ pMac->scan.countryCodeCurrent,
+ psessionEntry->currentOperChannel,
+ psessionEntry->htSecondaryChannelOffset);
}
else
{
- PELOGE(limLog(pMac, LOG1, FL("Present Operating channel=%d offset=%d class=%d"),
- psessionEntry->currentOperChannel,
- psessionEntry->htSecondaryChannelOffset,
- op_class);)
+ limLog(pMac, LOG1,
+ FL("Present Operating channel=%d offset=%d class=%d"),
+ psessionEntry->currentOperChannel,
+ psessionEntry->htSecondaryChannelOffset,
+ op_class);
}
suppOperClasses->present = 1;
suppOperClasses->classes[0] = op_class;
@@ -5214,15 +5241,14 @@
tANI_U8 sessionId;
tSirResultCodes resultCode = eSIR_SME_INVALID_PARAMETERS;
- VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_INFO,
- ("Send Mgmt Recieved")) ;
+ limLog(pMac, LOG1, FL("Send Mgmt Recieved"));
if((psessionEntry = peFindSessionByBssid(pMac, pSendMgmtReq->bssid, &sessionId))
== NULL)
{
- VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_ERROR,
- "PE Session does not exist for given sme sessionId %d",
- pSendMgmtReq->sessionId);
+ limLog(pMac, LOGE,
+ FL("PE Session does not exist for given sme sessionId %d"),
+ pSendMgmtReq->sessionId);
goto lim_tdls_send_mgmt_error;
}
@@ -5243,16 +5269,15 @@
(psessionEntry->limSmeState != eLIM_SME_LINK_EST_STATE))
{
- limLog(pMac, LOGE, "send mgmt received in invalid LIMsme "
- "state (%d)", psessionEntry->limSmeState);
+ limLog(pMac, LOGE, FL("send mgmt received in invalid LIMsme state (%d)"),
+ psessionEntry->limSmeState);
goto lim_tdls_send_mgmt_error;
}
switch( pSendMgmtReq->reqType )
{
case SIR_MAC_TDLS_DIS_REQ:
- VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_INFO,
- "Transmit Discovery Request Frame") ;
+ limLog(pMac, LOG1, FL("Transmit Discovery Request Frame"));
/* format TDLS discovery request frame and transmit it */
limSendTdlsDisReqFrame(pMac, pSendMgmtReq->peerMac, pSendMgmtReq->dialog,
psessionEntry) ;
@@ -5260,6 +5285,7 @@
break;
case SIR_MAC_TDLS_DIS_RSP:
{
+ limLog(pMac, LOG1, FL("Transmit Discovery Response Frame"));
//Send a response mgmt action frame
limSendTdlsDisRspFrame(pMac, pSendMgmtReq->peerMac,
pSendMgmtReq->dialog, psessionEntry,
@@ -5270,6 +5296,7 @@
break;
case SIR_MAC_TDLS_SETUP_REQ:
{
+ limLog(pMac, LOG1, FL("Transmit Setup Request Frame"));
limSendTdlsLinkSetupReqFrame(pMac,
pSendMgmtReq->peerMac, pSendMgmtReq->dialog, psessionEntry,
&pSendMgmtReq->addIe[0], (pSendMgmtReq->length - sizeof(tSirTdlsSendMgmtReq)));
@@ -5278,6 +5305,7 @@
break;
case SIR_MAC_TDLS_SETUP_RSP:
{
+ limLog(pMac, LOG1, FL("Transmit Setup Response Frame"));
limSendTdlsSetupRspFrame(pMac,
pSendMgmtReq->peerMac, pSendMgmtReq->dialog, psessionEntry, pSendMgmtReq->statusCode,
&pSendMgmtReq->addIe[0], (pSendMgmtReq->length - sizeof(tSirTdlsSendMgmtReq)));
@@ -5286,6 +5314,7 @@
break;
case SIR_MAC_TDLS_SETUP_CNF:
{
+ limLog(pMac, LOG1, FL("Transmit Setup Confirm Frame"));
limSendTdlsLinkSetupCnfFrame(pMac, pSendMgmtReq->peerMac, pSendMgmtReq->dialog, pSendMgmtReq->peerCapability,
psessionEntry, &pSendMgmtReq->addIe[0], (pSendMgmtReq->length - sizeof(tSirTdlsSendMgmtReq)));
resultCode = eSIR_SME_SUCCESS;
@@ -5293,6 +5322,7 @@
break;
case SIR_MAC_TDLS_TEARDOWN:
{
+ limLog(pMac, LOG1, FL("Transmit Teardown Frame"));
limSendTdlsTeardownFrame(pMac,
pSendMgmtReq->peerMac, pSendMgmtReq->statusCode, pSendMgmtReq->responder, psessionEntry,
&pSendMgmtReq->addIe[0], (pSendMgmtReq->length - sizeof(tSirTdlsSendMgmtReq)));
@@ -5341,7 +5371,7 @@
pTdlsLinkEstablishReqRsp = vos_mem_malloc(sizeof(tSirTdlsLinkEstablishReqRsp));
if ( NULL == pTdlsLinkEstablishReqRsp )
{
- PELOGE(limLog(pMac, LOGE, FL("Failed to allocate memory"));)
+ limLog(pMac, LOGE, FL("Failed to allocate memory"));
return ;
}
pTdlsLinkEstablishReqRsp->statusCode = status ;
@@ -5404,7 +5434,7 @@
pDelSta = vos_mem_malloc(sizeof(tSirTdlsDelStaRsp));
if ( NULL == pDelSta )
{
- PELOGE(limLog(pMac, LOGE, FL("Failed to allocate memory"));)
+ limLog(pMac, LOGE, FL("Failed to allocate memory"));
return eSIR_FAILURE;
}
@@ -5444,15 +5474,14 @@
tpPESession psessionEntry;
tANI_U8 sessionId;
- VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_INFO,
- ("Send Mgmt Recieved")) ;
+ limLog(pMac, LOG1, FL("TDLS Add STA Request Recieved"));
if((psessionEntry = peFindSessionByBssid(pMac, pAddStaReq->bssid, &sessionId))
== NULL)
{
- VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_ERROR,
- "PE Session does not exist for given sme sessionId %d",
- pAddStaReq->sessionId);
+ limLog(pMac, LOGE,
+ FL("PE Session does not exist for given sme sessionId %d"),
+ pAddStaReq->sessionId);
goto lim_tdls_add_sta_error;
}
@@ -5473,8 +5502,9 @@
(psessionEntry->limSmeState != eLIM_SME_LINK_EST_STATE))
{
- limLog(pMac, LOGE, "send mgmt received in invalid LIMsme "
- "state (%d)", psessionEntry->limSmeState);
+ limLog(pMac, LOGE,
+ FL("Add STA received in invalid LIMsme state (%d)"),
+ psessionEntry->limSmeState);
goto lim_tdls_add_sta_error;
}
@@ -5483,7 +5513,7 @@
/* To start with, send add STA request to HAL */
if (eSIR_FAILURE == limTdlsSetupAddSta(pMac, pAddStaReq, psessionEntry))
{
- limLog(pMac, LOGE, "%s: Add TDLS Station request failed ", __func__);
+ limLog(pMac, LOGE, FL("Add TDLS Station request failed"));
goto lim_tdls_add_sta_error;
}
return eSIR_SUCCESS;
@@ -5506,15 +5536,14 @@
tANI_U8 sessionId;
tpDphHashNode pStaDs = NULL ;
- VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_INFO,
- ("Send Mgmt Recieved")) ;
+ limLog(pMac, LOG1, FL("TDLS Delete STA Request Recieved"));
if((psessionEntry = peFindSessionByBssid(pMac, pDelStaReq->bssid, &sessionId))
== NULL)
{
- VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_ERROR,
- "PE Session does not exist for given sme sessionId %d",
- pDelStaReq->sessionId);
+ limLog(pMac, LOGE,
+ FL("PE Session does not exist for given sme sessionId %d"),
+ pDelStaReq->sessionId);
limSendSmeTdlsDelStaRsp(pMac, pDelStaReq->sessionId, pDelStaReq->peerMac,
NULL, eSIR_FAILURE) ;
return eSIR_FAILURE;
@@ -5537,8 +5566,8 @@
(psessionEntry->limSmeState != eLIM_SME_LINK_EST_STATE))
{
- limLog(pMac, LOGE, "Del Sta received in invalid LIMsme state (%d)",
- psessionEntry->limSmeState);
+ limLog(pMac, LOGE, FL("Del Sta received in invalid LIMsme state (%d)"),
+ psessionEntry->limSmeState);
goto lim_tdls_del_sta_error;
}
@@ -5614,15 +5643,14 @@
tANI_U16 peerIdx = 0 ;
tpDphHashNode pStaDs = NULL ;
- VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_INFO,
- ("Send Mgmt Recieved")) ;
+ limLog(pMac, LOG1, FL("Link Establish Request 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",
- pTdlsLinkEstablishReq->sessionId);
+ limLog(pMac, LOGE,
+ FL("PE Session does not exist for given sme sessionId %d"),
+ pTdlsLinkEstablishReq->sessionId);
limSendSmeTdlsLinkEstablishReqRsp(pMac, pTdlsLinkEstablishReq->sessionId, pTdlsLinkEstablishReq->peerMac,
NULL, eSIR_FAILURE) ;
return eSIR_FAILURE;
@@ -5645,8 +5673,9 @@
(psessionEntry->limSmeState != eLIM_SME_LINK_EST_STATE))
{
- limLog(pMac, LOGE, "TDLS Link Establish Request received in "
- "invalid LIMsme state (%d)", psessionEntry->limSmeState);
+ limLog(pMac, LOGE,
+ FL("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 */
@@ -5654,15 +5683,15 @@
&psessionEntry->dph.dphHashTable) ;
if ( NULL == pStaDs )
{
- limLog( pMac, LOGE, FL( "pStaDs is NULL" ));
+ limLog(pMac, LOGE, FL( "pStaDs is NULL"));
goto lim_tdls_link_establish_error;
}
pMsgTdlsLinkEstablishReq = vos_mem_malloc(sizeof( tTdlsLinkEstablishParams ));
if ( NULL == pMsgTdlsLinkEstablishReq )
{
- limLog( pMac, LOGE,
- FL( "Unable to allocate memory TDLS Link Establish Request" ));
+ limLog(pMac, LOGE,
+ FL("Unable to allocate memory TDLS Link Establish Request"));
return eSIR_MEM_ALLOC_FAILED;
}
@@ -5689,7 +5718,7 @@
* Could not get Valid channel list from CFG.
* Log error.
*/
- limLog(pMac, LOGP,
+ limLog(pMac, LOGE,
FL("could not retrieve Valid channel list"));
}
limTdlsGetIntersection(selfSupportedChannels, selfNumChans,
@@ -5729,7 +5758,7 @@
if (NULL == psessionEntry)
{
- PELOGE(limLog(pMac, LOGE, FL("NULL psessionEntry"));)
+ limLog(pMac, LOGE, FL("NULL psessionEntry"));
return eSIR_FAILURE;
}
@@ -5745,8 +5774,8 @@
if (NULL != pStaDs)
{
- PELOGE(limLog(pMac, LOGE, FL("Deleting "MAC_ADDRESS_STR),
- MAC_ADDR_ARRAY(pStaDs->staAddr)););
+ limLog(pMac, LOGE, FL("Deleting "MAC_ADDRESS_STR),
+ MAC_ADDR_ARRAY(pStaDs->staAddr));
limSendDeauthMgmtFrame(pMac, eSIR_MAC_DEAUTH_LEAVING_BSS_REASON,
pStaDs->staAddr, psessionEntry, FALSE);
diff --git a/CORE/SYS/legacy/src/utils/src/parserApi.c b/CORE/SYS/legacy/src/utils/src/parserApi.c
index b8bba76..ed5a726 100644
--- a/CORE/SYS/legacy/src/utils/src/parserApi.c
+++ b/CORE/SYS/legacy/src/utils/src/parserApi.c
@@ -1632,6 +1632,7 @@
{
tANI_U32 val = 0;
+ limLog(pMac, LOG1, FL("populate WMM IE in Setup Request Frame"));
pInfo->version = SIR_MAC_OUI_VERSION_1;
pInfo->acvo_uapsd = LIM_UAPSD_GET(ACVO, pMac->lim.gUapsdPerAcBitmask);
pInfo->acvi_uapsd = LIM_UAPSD_GET(ACVI, pMac->lim.gUapsdPerAcBitmask);
@@ -1640,7 +1641,6 @@
if(wlan_cfgGetInt(pMac, WNI_CFG_MAX_SP_LENGTH, &val) != eSIR_SUCCESS)
PELOGE(limLog(pMac, LOGE, FL("could not retrieve Max SP Length \n"));)
-
pInfo->max_sp_length = (tANI_U8)val;
pInfo->present = 1;
}