wlan: Replace __FUNCTION__ argument with __func__ in the wlan driver
The fix is to not use the gcc specific __FUNCTION__ to capture function
name; but use __func__ which is a C-99 standard identifier
Change-Id: Ie36f1bb87a3a4a51ec177ab5b6a253e279401e88
CR-Fixed: NA
diff --git a/CORE/BAP/src/bapApiData.c b/CORE/BAP/src/bapApiData.c
index 5c35b4b..fd03308 100644
--- a/CORE/BAP/src/bapApiData.c
+++ b/CORE/BAP/src/bapApiData.c
@@ -323,7 +323,7 @@
if ( NULL == pBtampCtx)
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "Invalid BAP handle value in %s", __FUNCTION__);
+ "Invalid BAP handle value in %s", __func__);
return VOS_STATUS_E_FAULT;
}
@@ -347,7 +347,7 @@
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
"WLAN BAP: phy_link_handle mismatch in %s phy_link_handle=%d hciACLHeader.phyLinkHandle=%d",
- __FUNCTION__, phy_link_handle, hciACLHeader.phyLinkHandle);
+ __func__, phy_link_handle, hciACLHeader.phyLinkHandle);
return VOS_STATUS_E_INVAL;
}
@@ -362,7 +362,7 @@
if ( VOS_STATUS_SUCCESS != vosStatus )
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO,
- "Unable to retrieve STA Id from BAP context and phy_link_handle in %s", __FUNCTION__);
+ "Unable to retrieve STA Id from BAP context and phy_link_handle in %s", __func__);
return VOS_STATUS_E_FAULT;
}
@@ -373,7 +373,7 @@
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
"WLAN BAP: Invalid logical link handle (%d) in %s. Corrected.",
hciACLHeader.logLinkHandle,
- __FUNCTION__);
+ __func__);
// JEZ090123: Insure that the logical link value is good
hciACLHeader.logLinkHandle = 1;
@@ -391,7 +391,7 @@
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
"WLAN BAP: Invalid logical link entry in %s",
- __FUNCTION__);
+ __func__);
return VOS_STATUS_E_INVAL;
}
@@ -501,7 +501,7 @@
if (( NULL == btampHandle) || (NULL == pHciData) || (NULL == pucAC))
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "Invalid params in %s", __FUNCTION__);
+ "Invalid params in %s", __func__);
return VOS_STATUS_E_FAULT;
}
pBtampCtx = (ptBtampContext) btampHandle;
@@ -513,7 +513,7 @@
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
"WLAN BAP: Invalid logical link handle (%d) in %s",
hciACLHeader.logLinkHandle,
- __FUNCTION__);
+ __func__);
return VOS_STATUS_E_INVAL;
}
@@ -528,7 +528,7 @@
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
"WLAN BAP: Invalid logical link entry in %s",
- __FUNCTION__);
+ __func__);
return VOS_STATUS_E_INVAL;
}
@@ -595,7 +595,7 @@
if ( NULL == pBtampCtx)
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "Invalid BAP handle value in %s", __FUNCTION__);
+ "Invalid BAP handle value in %s", __func__);
return VOS_STATUS_E_FAULT;
}
@@ -640,7 +640,7 @@
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "Invalid LLC header for BT-AMP packet in %s", __FUNCTION__);
+ "Invalid LLC header for BT-AMP packet in %s", __func__);
return VOS_STATUS_E_FAULT;
}
#endif //BAP_DEBUG
@@ -657,7 +657,7 @@
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "Invalid (non-data) frame type in %s", __FUNCTION__);
+ "Invalid (non-data) frame type in %s", __func__);
return VOS_STATUS_E_FAULT;
}
@@ -672,7 +672,7 @@
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "MAC address mismatch in %s", __FUNCTION__);
+ "MAC address mismatch in %s", __func__);
return VOS_STATUS_E_FAULT;
}
#endif //BAP_DEBUG
@@ -874,7 +874,7 @@
protoType = vos_be16_to_cpu(protoType);
VOS_TRACE( VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_ERROR,
- "%s: received : %d, => BAP",__FUNCTION__,
+ "%s: received : %d, => BAP",__func__,
protoType);
if(WLANBAP_BT_AMP_TYPE_DATA == protoType)
@@ -903,7 +903,7 @@
{
VOS_TRACE( VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_ERROR,
"%s: link Supervision packet received over TL: %d, => BAP",
- __FUNCTION__,protoType);
+ __func__,protoType);
btampHandle = (ptBtampHandle)bapContext;
vosStatus = WLANBAP_RxProcLsPkt(
btampHandle,
@@ -981,14 +981,14 @@
if ( NULL == vosDataBuff)
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "Invalid vosDataBuff value in %s", __FUNCTION__);
+ "Invalid vosDataBuff value in %s", __func__);
return VOS_STATUS_E_FAULT;
}
if ( NULL == bapContext)
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "Invalid bapContext value in %s", __FUNCTION__);
+ "Invalid bapContext value in %s", __func__);
vos_pkt_return_packet( vosDataBuff );
return VOS_STATUS_E_FAULT;
}
@@ -1013,7 +1013,7 @@
#ifdef BAP_DEBUG
/* Trace the bapContext referenced. */
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH,
- "WLAN BAP Context Monitor: bapContext value = %p in %s:%d. vosDataBuff=%p", bapContext, __FUNCTION__, __LINE__, vosDataBuff );
+ "WLAN BAP Context Monitor: bapContext value = %p in %s:%d. vosDataBuff=%p", bapContext, __func__, __LINE__, vosDataBuff );
#endif //BAP_DEBUG
// Sanity check the log_link_handle value
@@ -1028,7 +1028,7 @@
} else
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "In %s:%d: Invalid logical link handle: %d", __FUNCTION__, __LINE__, hciACLHeader.logLinkHandle);
+ "In %s:%d: Invalid logical link handle: %d", __func__, __LINE__, hciACLHeader.logLinkHandle);
}
/* Invoke the callback that BSL registered with me */
@@ -1164,7 +1164,7 @@
#ifdef BAP_DEBUG
/* Trace the tBtampCtx being passed in. */
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH,
- "WLAN BAP Context Monitor: pBtampCtx value = %p in %s:%d", pBtampCtx, __FUNCTION__, __LINE__ );
+ "WLAN BAP Context Monitor: pBtampCtx value = %p in %s:%d", pBtampCtx, __func__, __LINE__ );
#endif //BAP_DEBUG
/*------------------------------------------------------------------------
diff --git a/CORE/BAP/src/bapApiExt.c b/CORE/BAP/src/bapApiExt.c
index 5b9ba26..80fa34e 100644
--- a/CORE/BAP/src/bapApiExt.c
+++ b/CORE/BAP/src/bapApiExt.c
@@ -149,7 +149,7 @@
if (( NULL == pBtampCtx ) || (NULL == channel) || (NULL == activeFlag))
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "Invalid BAP pointer in %s", __FUNCTION__);
+ "Invalid BAP pointer in %s", __func__);
return VOS_STATUS_E_FAULT;
}
@@ -158,7 +158,7 @@
if(NULL == halHandle)
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "halHandle is NULL in %s", __FUNCTION__);
+ "halHandle is NULL in %s", __func__);
return VOS_STATUS_E_FAULT;
}
@@ -166,7 +166,7 @@
!= eHAL_STATUS_SUCCESS )
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "Get CFG failed in %s", __FUNCTION__);
+ "Get CFG failed in %s", __func__);
return VOS_STATUS_E_FAULT;
}
diff --git a/CORE/BAP/src/bapApiHCBB.c b/CORE/BAP/src/bapApiHCBB.c
index dd21a59..2f9f406 100644
--- a/CORE/BAP/src/bapApiHCBB.c
+++ b/CORE/BAP/src/bapApiHCBB.c
@@ -141,13 +141,13 @@
tHalHandle hHal = NULL;
/*- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -*/
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s: btampHandle value: %x", __FUNCTION__, btampHandle);
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s: btampHandle value: %x", __func__, btampHandle);
/* Validate params */
if (btampHandle == NULL)
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "btampHandle is NULL in %s", __FUNCTION__);
+ "btampHandle is NULL in %s", __func__);
return VOS_STATUS_E_FAULT;
}
@@ -157,7 +157,7 @@
if (NULL == hHal)
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "hHal is NULL in %s", __FUNCTION__);
+ "hHal is NULL in %s", __func__);
return VOS_STATUS_E_FAULT;
}
@@ -288,7 +288,7 @@
ptBtampContext btampContext = (ptBtampContext) btampHandle;
/*- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -*/
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s: btampHandle value: %x", __FUNCTION__, btampHandle);
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s: btampHandle value: %x", __func__, btampHandle);
/* Validate params */
if (btampHandle == NULL) {
@@ -361,14 +361,14 @@
ptBtampContext btampContext;
/*- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -*/
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s: btampHandle value: %x", __FUNCTION__, btampHandle);
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s: btampHandle value: %x", __func__, btampHandle);
/* Validate params */
/* Validate params */
if ((NULL == btampHandle) || (NULL == pBapHCIEvent))
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH,
- "Invalid input parameters in %s", __FUNCTION__);
+ "Invalid input parameters in %s", __func__);
return VOS_STATUS_E_FAULT;
}
@@ -441,13 +441,13 @@
/*- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -*/
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH,
- "%s: btampHandle value: %x", __FUNCTION__, btampHandle);
+ "%s: btampHandle value: %x", __func__, btampHandle);
/* Validate params */
if ((NULL == btampHandle) || (NULL == pBapHCIEvent))
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH,
- "Invalid input parameters in %s", __FUNCTION__);
+ "Invalid input parameters in %s", __func__);
return VOS_STATUS_E_FAULT;
}
@@ -510,14 +510,14 @@
/*- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -*/
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH,
- "%s: btampHandle value: %x", __FUNCTION__, btampHandle);
+ "%s: btampHandle value: %x", __func__, btampHandle);
/* Validate params */
if ((NULL == btampHandle) || (NULL == pBapHCIWriteConnectionAcceptTimeout)
|| (NULL == pBapHCIEvent))
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH,
- "Invalid input parameters in %s", __FUNCTION__);
+ "Invalid input parameters in %s", __func__);
return VOS_STATUS_E_FAULT;
}
@@ -529,7 +529,7 @@
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH,
"Out of range for connection accept timeout parameters in %s",
- __FUNCTION__);
+ __func__);
pBapHCIEvent->u.btampCommandCompleteEvent.cc_event.Write_Connection_Accept_TO.status
= WLANBAP_ERROR_INVALID_HCI_CMND_PARAM;
}
@@ -601,14 +601,14 @@
/*- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -*/
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH,
- "%s: btampHandle value: %x", __FUNCTION__, btampHandle);
+ "%s: btampHandle value: %x", __func__, btampHandle);
/* Validate params */
if ((NULL == btampHandle) || (NULL == pBapHCIReadLinkSupervisionTimeout) ||
(NULL == pBapHCIEvent))
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH,
- "Invalid input parameters in %s", __FUNCTION__);
+ "Invalid input parameters in %s", __func__);
return VOS_STATUS_E_FAULT;
}
@@ -619,7 +619,7 @@
if (phyLinkHandle != btampContext->phy_link_handle)
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH,
- "Invalid Physical link handle in %s", __FUNCTION__);
+ "Invalid Physical link handle in %s", __func__);
pBapHCIEvent->u.btampCommandCompleteEvent.cc_event.Read_Link_Supervision_TO.link_supervision_timeout
= 0x00; /* Invalid value */
pBapHCIEvent->u.btampCommandCompleteEvent.cc_event.Read_Link_Supervision_TO.log_link_handle
@@ -693,14 +693,14 @@
/*- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -*/
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH,
- "%s: btampHandle value: %x", __FUNCTION__, btampHandle);
+ "%s: btampHandle value: %x", __func__, btampHandle);
/* Validate params */
if ((NULL == btampHandle) || (NULL == pBapHCIWriteLinkSupervisionTimeout) ||
(NULL == pBapHCIEvent))
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH,
- "Invalid input parameters in %s", __FUNCTION__);
+ "Invalid input parameters in %s", __func__);
return VOS_STATUS_E_FAULT;
}
@@ -711,7 +711,7 @@
if (phyLinkHandle != btampContext->phy_link_handle)
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH,
- "Invalid Physical link handle in %s", __FUNCTION__);
+ "Invalid Physical link handle in %s", __func__);
pBapHCIEvent->u.btampCommandCompleteEvent.cc_event.Write_Link_Supervision_TO.log_link_handle
= pBapHCIWriteLinkSupervisionTimeout->log_link_handle;
pBapHCIEvent->u.btampCommandCompleteEvent.cc_event.Write_Link_Supervision_TO.status
@@ -785,13 +785,13 @@
/*- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -*/
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH,
- "%s: btampHandle value: %x", __FUNCTION__, btampHandle);
+ "%s: btampHandle value: %x", __func__, btampHandle);
/* Validate params */
if ((NULL == btampHandle) || (NULL == pBapHCIEvent))
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH,
- "Invalid input parameters in %s", __FUNCTION__);
+ "Invalid input parameters in %s", __func__);
return VOS_STATUS_E_FAULT;
}
@@ -854,14 +854,14 @@
/*- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -*/
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH,
- "%s: btampHandle value: %x", __FUNCTION__, btampHandle);
+ "%s: btampHandle value: %x", __func__, btampHandle);
/* Validate params */
if ((NULL == btampHandle) || (NULL == pBapHCIWriteLogicalLinkAcceptTimeout)
|| (NULL == pBapHCIEvent))
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH,
- "Invalid input parameters in %s", __FUNCTION__);
+ "Invalid input parameters in %s", __func__);
return VOS_STATUS_E_FAULT;
}
@@ -873,7 +873,7 @@
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH,
"Out of range for logical connection accept timeout parameters in %s",
- __FUNCTION__);
+ __func__);
pBapHCIEvent->u.btampCommandCompleteEvent.cc_event.Write_Logical_Link_Accept_TO.status
= WLANBAP_ERROR_INVALID_HCI_CMND_PARAM;
}
@@ -942,14 +942,14 @@
/*- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -*/
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH,
- "%s: btampHandle value: %x", __FUNCTION__, btampHandle);
+ "%s: btampHandle value: %x", __func__, btampHandle);
/* Validate params */
if ((NULL == btampHandle) || (NULL == pBapHCISetEventMaskPage2)
|| (NULL == pBapHCIEvent))
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH,
- "Invalid input parameters in %s", __FUNCTION__);
+ "Invalid input parameters in %s", __func__);
return VOS_STATUS_E_FAULT;
}
@@ -1017,13 +1017,13 @@
/*- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -*/
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH,
- "%s: btampHandle value: %x", __FUNCTION__, btampHandle);
+ "%s: btampHandle value: %x", __func__, btampHandle);
/* Validate params */
if ((NULL == btampHandle) || (NULL == pBapHCIEvent))
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH,
- "Invalid input parameters in %s", __FUNCTION__);
+ "Invalid input parameters in %s", __func__);
return VOS_STATUS_E_FAULT;
}
@@ -1099,14 +1099,14 @@
/*- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -*/
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH,
- "%s: btampHandle value: %x", __FUNCTION__, btampHandle);
+ "%s: btampHandle value: %x", __func__, btampHandle);
/* Validate params */
if ((NULL == btampHandle) || (NULL == pBapHCIWriteLocationData)
|| (NULL == pBapHCIEvent))
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH,
- "Invalid input parameters in %s", __FUNCTION__);
+ "Invalid input parameters in %s", __func__);
return VOS_STATUS_E_FAULT;
}
@@ -1180,13 +1180,13 @@
/*- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -*/
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH,
- "%s: btampHandle value: %x", __FUNCTION__, btampHandle);
+ "%s: btampHandle value: %x", __func__, btampHandle);
/* Validate params */
if ((NULL == btampHandle) || (NULL == pBapHCIEvent))
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH,
- "Invalid input parameters in %s", __FUNCTION__);
+ "Invalid input parameters in %s", __func__);
return VOS_STATUS_E_FAULT;
}
@@ -1385,13 +1385,13 @@
/*- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -*/
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH,
- "%s: btampHandle value: %x", __FUNCTION__, btampHandle);
+ "%s: btampHandle value: %x", __func__, btampHandle);
/* Validate params */
if ((NULL == btampHandle) || (NULL == pBapHCIEvent))
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH,
- "Invalid input parameters in %s", __FUNCTION__);
+ "Invalid input parameters in %s", __func__);
return VOS_STATUS_E_FAULT;
}
@@ -1526,13 +1526,13 @@
/*- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -*/
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH,
- "%s: btampHandle value: %x", __FUNCTION__, btampHandle);
+ "%s: btampHandle value: %x", __func__, btampHandle);
/* Validate params */
if ((NULL == btampHandle) || (NULL == pBapHCIEvent))
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH,
- "Invalid input parameters in %s", __FUNCTION__);
+ "Invalid input parameters in %s", __func__);
return VOS_STATUS_E_FAULT;
}
@@ -1626,13 +1626,13 @@
/*- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -*/
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH,
- "%s: btampHandle value: %x", __FUNCTION__, btampHandle);
+ "%s: btampHandle value: %x", __func__, btampHandle);
/* Validate params */
if ((NULL == btampHandle) || (NULL == pBapHCIEvent))
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH,
- "Invalid input parameters in %s", __FUNCTION__);
+ "Invalid input parameters in %s", __func__);
return VOS_STATUS_E_FAULT;
}
diff --git a/CORE/BAP/src/bapApiInfo.c b/CORE/BAP/src/bapApiInfo.c
index c622999..6250ea3 100644
--- a/CORE/BAP/src/bapApiInfo.c
+++ b/CORE/BAP/src/bapApiInfo.c
@@ -150,7 +150,7 @@
}
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s: btampHandle value: %x", __FUNCTION__, btampHandle);
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s: btampHandle value: %x", __func__, btampHandle);
/* Format the command complete event to return... */
@@ -226,7 +226,7 @@
}
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s: btampHandle value: %x", __FUNCTION__, btampHandle);
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s: btampHandle value: %x", __func__, btampHandle);
/* Format the command complete event to return... */
@@ -292,7 +292,7 @@
}
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s: btampHandle value: %x", __FUNCTION__, btampHandle);
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s: btampHandle value: %x", __func__, btampHandle);
/* Format the command complete event to return... */
@@ -362,7 +362,7 @@
}
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s: btampHandle value: %x", __FUNCTION__, btampHandle);
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s: btampHandle value: %x", __func__, btampHandle);
/* Format the command complete event to return... */
@@ -523,13 +523,13 @@
VOS_STATUS vosStatus;
/*- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -*/
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_FATAL, "%s: btampHandle value: %x", __FUNCTION__, btampHandle);
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_FATAL, "%s: btampHandle value: %x", __func__, btampHandle);
/* Validate params */
if (btampHandle == NULL)
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_FATAL,
- "btampHandle is NULL in %s", __FUNCTION__);
+ "btampHandle is NULL in %s", __func__);
return VOS_STATUS_E_FAULT;
}
@@ -589,13 +589,13 @@
ptBtampContext btampContext = (ptBtampContext) btampHandle;
/*- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -*/
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s: btampHandle value: %x", __FUNCTION__, btampHandle);
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s: btampHandle value: %x", __func__, btampHandle);
/* Validate params */
if (btampHandle == NULL)
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "btampHandle is NULL in %s", __FUNCTION__);
+ "btampHandle is NULL in %s", __func__);
//?? shall we say true or false
return VOS_FALSE;
diff --git a/CORE/BAP/src/bapApiLinkCntl.c b/CORE/BAP/src/bapApiLinkCntl.c
index 94876c4..8639c9c 100644
--- a/CORE/BAP/src/bapApiLinkCntl.c
+++ b/CORE/BAP/src/bapApiLinkCntl.c
@@ -183,7 +183,7 @@
v_U8_t status; /* return the BT-AMP status here */
/*- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -*/
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, before switch on roamStatus = %d", __FUNCTION__, roamStatus);
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, before switch on roamStatus = %d", __func__, roamStatus);
switch (roamStatus) {
//JEZ081110: For testing purposes, with Infra STA as BT STA, this
@@ -192,7 +192,7 @@
//case eCSR_ROAM_ROAMING_START:
case eCSR_ROAM_ASSOCIATION_START:
/* bapRoamCompleteCallback with eCSR_ROAM_RESULT_WDS_STARTED */
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, CSR roamResult = %s (%d)", __FUNCTION__, "eCSR_ROAM_ROAMING_START", roamResult);
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, CSR roamResult = %s (%d)", __func__, "eCSR_ROAM_ROAMING_START", roamResult);
// This only gets called when CSR decides to roam on its own - due to lostlink.
#if 0
if ((pCsrRoamInfo) && (pCsrRoamInfo->pConnectedProfile) && (pCsrRoamInfo->pConnectedProfile->pBssDesc))
@@ -200,7 +200,7 @@
memcpy(bssid.ether_addr_octet, pCsrRoamInfo->pConnectedProfile->pBssDesc->bssId,
sizeof(tSirMacAddr));
apple80211Interface->willRoam(&bssid); // Return result isn't significant
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s: willRoam returns\n", __FUNCTION__);
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s: willRoam returns\n", __func__);
}
#endif //0
/* Fill in the event structure */
@@ -216,7 +216,7 @@
case eCSR_ROAM_SET_KEY_COMPLETE:
/* bapRoamCompleteCallback with eCSR_ROAM_SET_KEY_COMPLETE */
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, CSR roamStatus = %s (%d)", __FUNCTION__, "eCSR_ROAM_SET_KEY_COMPLETE", roamStatus);
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, CSR roamStatus = %s (%d)", __func__, "eCSR_ROAM_SET_KEY_COMPLETE", roamStatus);
/* Fill in the event structure */
bapEvent.event = eWLAN_BAP_MAC_KEY_SET_SUCCESS;
@@ -231,10 +231,10 @@
case eCSR_ROAM_DISASSOCIATED:
/* bapRoamCompleteCallback with eCSR_ROAM_DISASSOCIATED */
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, CSR roamStatus = %s (%d)", __FUNCTION__, "eCSR_ROAM_DISASSOCIATED", roamStatus);
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, CSR roamStatus = %s (%d)", __func__, "eCSR_ROAM_DISASSOCIATED", roamStatus);
case eCSR_ROAM_LOSTLINK:
/* bapRoamCompleteCallback with eCSR_ROAM_LOSTLINK */
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, CSR roamStatus = %s (%d)", __FUNCTION__, "eCSR_ROAM_LOSTLINK", roamStatus);
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, CSR roamStatus = %s (%d)", __func__, "eCSR_ROAM_LOSTLINK", roamStatus);
if (roamResult != eCSR_ROAM_RESULT_NONE) {
/* Fill in the event structure */
@@ -250,20 +250,20 @@
break;
default:
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, unsupported CSR roamStatus = %d", __FUNCTION__, roamStatus);
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, unsupported CSR roamStatus = %d", __func__, roamStatus);
break;
}
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, before switch on roamResult = %d", __FUNCTION__, roamResult);
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, before switch on roamResult = %d", __func__, roamResult);
switch (roamResult) {
//JEZ081110: Commented out for testing. Test relies upon IBSS.
case eCSR_ROAM_RESULT_IBSS_STARTED:
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, CSR roamResult = %s (%d)", __FUNCTION__, "eCSR_ROAM_RESULT_IBSS_STARTED", roamResult);
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, CSR roamResult = %s (%d)", __func__, "eCSR_ROAM_RESULT_IBSS_STARTED", roamResult);
case eCSR_ROAM_RESULT_WDS_STARTED:
/* bapRoamCompleteCallback with eCSR_ROAM_RESULT_WDS_STARTED */
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, CSR roamResult = %s (%d)", __FUNCTION__, "eCSR_ROAM_RESULT_WDS_STARTED", roamResult);
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, CSR roamResult = %s (%d)", __func__, "eCSR_ROAM_RESULT_WDS_STARTED", roamResult);
/* Fill in the event structure */
bapEvent.event = eWLAN_BAP_MAC_START_BSS_SUCCESS;
@@ -282,13 +282,13 @@
//case eCSR_ROAM_RESULT_NOT_ASSOCIATED:
//case eCSR_ROAM_RESULT_IBSS_START_FAILED:
/* bapRoamCompleteCallback with eCSR_ROAM_RESULT_FAILURE or eCSR_ROAM_RESULT_NOT_ASSOCIATED */
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, CSR roamResult = %s (%d)", __FUNCTION__, "eCSR_ROAM_RESULT_FAILURE", roamResult);
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, CSR roamResult = %s (%d)", __func__, "eCSR_ROAM_RESULT_FAILURE", roamResult);
#ifdef FEATURE_WLAN_BTAMP_UT_RF
break;
#endif
case eCSR_ROAM_RESULT_WDS_START_FAILED:
/* bapRoamCompleteCallback with eCSR_ROAM_RESULT_WDS_START_FAILED */
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, CSR roamResult = %s (%d)", __FUNCTION__, "eCSR_ROAM_RESULT_WDS_START_FAILED", roamResult);
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, CSR roamResult = %s (%d)", __func__, "eCSR_ROAM_RESULT_WDS_START_FAILED", roamResult);
/* Fill in the event structure */
/* I don't think I should signal a eCSR_ROAM_RESULT_FAILURE
@@ -306,12 +306,12 @@
//JEZ081110: Commented out for testing. This handles both Infra STA and IBSS STA.
case eCSR_ROAM_RESULT_IBSS_CONNECT:
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, CSR roamResult = %s (%d)", __FUNCTION__, "eCSR_ROAM_RESULT_IBSS_CONNECT", roamResult);
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, CSR roamResult = %s (%d)", __func__, "eCSR_ROAM_RESULT_IBSS_CONNECT", roamResult);
case eCSR_ROAM_RESULT_ASSOCIATED:
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, CSR roamResult = %s (%d)", __FUNCTION__, "eCSR_ROAM_RESULT_ASSOCIATED", roamResult);
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, CSR roamResult = %s (%d)", __func__, "eCSR_ROAM_RESULT_ASSOCIATED", roamResult);
case eCSR_ROAM_RESULT_WDS_ASSOCIATED:
/* bapRoamCompleteCallback with eCSR_ROAM_RESULT_WDS_ASSOCIATED */
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, CSR roamResult = %s (%d)", __FUNCTION__, "eCSR_ROAM_RESULT_WDS_ASSOCIATED", roamResult);
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, CSR roamResult = %s (%d)", __func__, "eCSR_ROAM_RESULT_WDS_ASSOCIATED", roamResult);
/* Fill in the event structure */
bapEvent.event = eWLAN_BAP_MAC_CONNECT_COMPLETED;
@@ -328,16 +328,16 @@
//JEZ081110: But I cannot rely upon IBSS for the initial testing.
//case eCSR_ROAM_RESULT_FAILURE:
case eCSR_ROAM_RESULT_IBSS_START_FAILED:
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, CSR roamResult = %s (%d)", __FUNCTION__, "eCSR_ROAM_RESULT_IBSS_START_FAILED", roamResult);
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, CSR roamResult = %s (%d)", __func__, "eCSR_ROAM_RESULT_IBSS_START_FAILED", roamResult);
case eCSR_ROAM_RESULT_NOT_ASSOCIATED:
/* bapRoamCompleteCallback with eCSR_ROAM_RESULT_FAILURE or eCSR_ROAM_RESULT_NOT_ASSOCIATED */
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, CSR roamResult = %s (%d)", __FUNCTION__, "eCSR_ROAM_RESULT_NOT_ASSOCIATED", roamResult);
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, CSR roamResult = %s (%d)", __func__, "eCSR_ROAM_RESULT_NOT_ASSOCIATED", roamResult);
#ifdef FEATURE_WLAN_BTAMP_UT_RF
break;
#endif
case eCSR_ROAM_RESULT_WDS_NOT_ASSOCIATED:
/* bapRoamCompleteCallback with eCSR_ROAM_RESULT_WDS_NOT_ASSOCIATED */
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, CSR roamResult = %s (%d)", __FUNCTION__, "eCSR_ROAM_RESULT_WDS_NOT_ASSOCIATED", roamResult);
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, CSR roamResult = %s (%d)", __func__, "eCSR_ROAM_RESULT_WDS_NOT_ASSOCIATED", roamResult);
/* Fill in the event structure */
bapEvent.event = eWLAN_BAP_MAC_CONNECT_FAILED;
@@ -353,13 +353,13 @@
//JEZ081110: I think I have to check for the bssType to
//differentiate between IBSS Start and IBSS Join success.
//case eCSR_ROAM_RESULT_IBSS_CONNECT:
- //VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, CSR roamResult = %s (%d)", __FUNCTION__, "eCSR_ROAM_RESULT_IBSS_CONNECT", roamResult);
+ //VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, CSR roamResult = %s (%d)", __func__, "eCSR_ROAM_RESULT_IBSS_CONNECT", roamResult);
//JEZ081110: Commented out for testing. Test relies upon IBSS.
// No longer commented out.
case eCSR_ROAM_RESULT_WDS_ASSOCIATION_IND:
/* bapRoamCompleteCallback with eCSR_ROAM_RESULT_WDS_ASSOCIATION_IND */
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, CSR roamResult = %s (%d)", __FUNCTION__, "eCSR_ROAM_RESULT_WDS_ASSOCIATION_IND", roamResult);
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, CSR roamResult = %s (%d)", __func__, "eCSR_ROAM_RESULT_WDS_ASSOCIATION_IND", roamResult);
/* Fill in the event structure */
bapEvent.event = eWLAN_BAP_MAC_CONNECT_INDICATION;
@@ -380,7 +380,7 @@
#if 0
case eCSR_ROAM_RESULT_KEY_SET:
/* bapRoamCompleteCallback with eCSR_ROAM_RESULT_KEY_SET */
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, CSR roamResult = %s (%d)", __FUNCTION__, "eCSR_ROAM_RESULT_KEY_SET", roamResult);
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, CSR roamResult = %s (%d)", __func__, "eCSR_ROAM_RESULT_KEY_SET", roamResult);
/* Fill in the event structure */
bapEvent.event = eWLAN_BAP_MAC_KEY_SET_SUCCESS;
@@ -395,10 +395,10 @@
#endif //0
case eCSR_ROAM_RESULT_DISASSOC_IND:
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, CSR roamResult = %s (%d)", __FUNCTION__, "eCSR_ROAM_RESULT_DISASSOC_IND", roamResult);
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, CSR roamResult = %s (%d)", __func__, "eCSR_ROAM_RESULT_DISASSOC_IND", roamResult);
case eCSR_ROAM_RESULT_WDS_DISASSOCIATED:
/* bapRoamCompleteCallback with eCSR_ROAM_RESULT_WDS_DISASSOCIATED */
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, CSR roamResult = %s (%d)", __FUNCTION__, "eCSR_ROAM_RESULT_WDS_DISASSOCIATED", roamResult);
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, CSR roamResult = %s (%d)", __func__, "eCSR_ROAM_RESULT_WDS_DISASSOCIATED", roamResult);
/* Fill in the event structure */
bapEvent.event = eWLAN_BAP_MAC_INDICATES_MEDIA_DISCONNECTION;
@@ -422,10 +422,10 @@
//JEZ081110: Commented out for testing. Test relies upon IBSS.
case eCSR_ROAM_RESULT_IBSS_INACTIVE:
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, CSR roamResult = %s (%d)", __FUNCTION__, "eCSR_ROAM_RESULT_IBSS_INACTIVE", roamResult);
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, CSR roamResult = %s (%d)", __func__, "eCSR_ROAM_RESULT_IBSS_INACTIVE", roamResult);
case eCSR_ROAM_RESULT_WDS_STOPPED:
/* bapRoamCompleteCallback with eCSR_ROAM_RESULT_WDS_STOPPED */
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, CSR roamResult = %s (%d)", __FUNCTION__, "eCSR_ROAM_RESULT_WDS_STOPPED", roamResult);
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, CSR roamResult = %s (%d)", __func__, "eCSR_ROAM_RESULT_WDS_STOPPED", roamResult);
/* Fill in the event structure */
bapEvent.event = eWLAN_BAP_MAC_READY_FOR_CONNECTIONS;
@@ -439,7 +439,7 @@
break;
default:
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, unsupported CSR roamResult = %d", __FUNCTION__, roamResult);
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, unsupported CSR roamResult = %d", __func__, roamResult);
break;
}
@@ -473,7 +473,7 @@
if (mLinkStatus == 0)
{
// enable the flow of data
- DBGLOG("%s: marking link as up in %s\n", __FUNCTION__, "eCSR_ROAM_RESULT_IBSS_CONNECT");
+ DBGLOG("%s: marking link as up in %s\n", __func__, "eCSR_ROAM_RESULT_IBSS_CONNECT");
mLinkStatus = 1;
((IO80211Interface*) mNetworkIF)->setLinkState(kIO80211NetworkLinkUp);
outputQueue->setCapacity(TRANSMIT_QUEUE_SIZE);
@@ -483,7 +483,7 @@
}
else
{
- DBGLOG("%s: link is already up in %s\n", __FUNCTION__, "eCSR_ROAM_RESULT_IBSS_CONNECT");
+ DBGLOG("%s: link is already up in %s\n", __func__, "eCSR_ROAM_RESULT_IBSS_CONNECT");
}
break;
@@ -491,7 +491,7 @@
// we have no more IBSS peers, so disable the flow of data
if (mLinkStatus != 0)
{
- DBGLOG("%s: marking link as down in %s\n", __FUNCTION__, "eCSR_ROAM_RESULT_IBSS_INACTIVE");
+ DBGLOG("%s: marking link as down in %s\n", __func__, "eCSR_ROAM_RESULT_IBSS_INACTIVE");
mLinkStatus = (tANI_U8) 0;
// JEZ070627: Revisit ?
((IO80211Interface*) mNetworkIF)->setLinkState(kIO80211NetworkLinkDown);
@@ -503,7 +503,7 @@
}
else
{
- DBGLOG("%s: link already down in %s\n", __FUNCTION__, "eCSR_ROAM_RESULT_IBSS_INACTIVE");
+ DBGLOG("%s: link already down in %s\n", __func__, "eCSR_ROAM_RESULT_IBSS_INACTIVE");
}
break;
@@ -530,13 +530,13 @@
{
mLinkStatus = (tANI_U8) 1;
((IO80211Interface*) mNetworkIF)->setLinkState(kIO80211NetworkLinkUp);
- DBGLOG("%s: marking link as up in %s\n", __FUNCTION__, "eCSR_ROAM_RESULT_ASSOCIATED");
+ DBGLOG("%s: marking link as up in %s\n", __func__, "eCSR_ROAM_RESULT_ASSOCIATED");
outputQueue->setCapacity(TRANSMIT_QUEUE_SIZE);
outputQueue->start();
}
else
{
- DBGLOG("%s: link is already up in %s\n", __FUNCTION__, "eCSR_ROAM_RESULT_ASSOCIATED");
+ DBGLOG("%s: link is already up in %s\n", __func__, "eCSR_ROAM_RESULT_ASSOCIATED");
}
break;
case eCSR_ROAM_RESULT_NOT_ASSOCIATED:
@@ -545,13 +545,13 @@
if (mLinkStatus != 0)
{
- DBGLOG("%s: marking link as down in %s\n", __FUNCTION__, "eCSR_ROAM_RESULT_NOT_ASSOCIATED");
+ DBGLOG("%s: marking link as down in %s\n", __func__, "eCSR_ROAM_RESULT_NOT_ASSOCIATED");
mLinkStatus = (tANI_U8) 0;
((IO80211Interface*) mNetworkIF)->setLinkState(kIO80211NetworkLinkDown);
}
else
{
- DBGLOG("%s: link already down in %s\n", __FUNCTION__, "eCSR_ROAM_RESULT_NOT_ASSOCIATED");
+ DBGLOG("%s: link already down in %s\n", __func__, "eCSR_ROAM_RESULT_NOT_ASSOCIATED");
}
break;
@@ -561,13 +561,13 @@
if (mLinkStatus != 0)
{
- DBGLOG("%s: marking link as down in %s\n", __FUNCTION__, "eCSR_ROAM_RESULT_FAILURE");
+ DBGLOG("%s: marking link as down in %s\n", __func__, "eCSR_ROAM_RESULT_FAILURE");
mLinkStatus = (tANI_U8) 0;
((IO80211Interface*) mNetworkIF)->setLinkState(kIO80211NetworkLinkDown);
}
else
{
- DBGLOG("%s: link already down in %s\n", __FUNCTION__, "eCSR_ROAM_RESULT_FAILURE");
+ DBGLOG("%s: link already down in %s\n", __func__, "eCSR_ROAM_RESULT_FAILURE");
}
break;
@@ -577,13 +577,13 @@
if (mLinkStatus != 0)
{
- DBGLOG("%s: marking link as down in %s\n", __FUNCTION__, "eCSR_ROAM_RESULT_DISASSOC_IND");
+ DBGLOG("%s: marking link as down in %s\n", __func__, "eCSR_ROAM_RESULT_DISASSOC_IND");
mLinkStatus = (tANI_U8) 0;
((IO80211Interface*) mNetworkIF)->setLinkState(kIO80211NetworkLinkDown);
}
else
{
- DBGLOG("%s: link already down in %s\n", __FUNCTION__, "eCSR_ROAM_RESULT_DISASSOC_IND");
+ DBGLOG("%s: link already down in %s\n", __func__, "eCSR_ROAM_RESULT_DISASSOC_IND");
}
//if (pCsrRoamInfo) // For now, leave this commented out. Until CSR changes integrated.
@@ -615,13 +615,13 @@
if (mLinkStatus != 0)
{
- DBGLOG("%s: marking link as down in %s\n", __FUNCTION__, "eCSR_ROAM_RESULT_DEAUTH_IND");
+ DBGLOG("%s: marking link as down in %s\n", __func__, "eCSR_ROAM_RESULT_DEAUTH_IND");
mLinkStatus = (tANI_U8) 0;
((IO80211Interface*) mNetworkIF)->setLinkState(kIO80211NetworkLinkDown);
}
else
{
- DBGLOG("%s: link already down in %s\n", __FUNCTION__, "eCSR_ROAM_RESULT_DEAUTH_IND");
+ DBGLOG("%s: link already down in %s\n", __func__, "eCSR_ROAM_RESULT_DEAUTH_IND");
}
//if (pCsrRoamInfo) // For now, leave this commented out. Until CSR changes integrated.
@@ -654,11 +654,11 @@
if (btampContext->mTKIPCounterMeasures)
{
((IO80211Interface*) mNetworkIF)->postMessage(APPLE80211_M_MIC_ERROR_UCAST);
- DBGLOG("%s: TKIP Countermeasures in effect in %s\n", __FUNCTION__, "eCSR_ROAM_RESULT_MIC_ERROR_UNICAST");
+ DBGLOG("%s: TKIP Countermeasures in effect in %s\n", __func__, "eCSR_ROAM_RESULT_MIC_ERROR_UNICAST");
}
else
{
- DBGLOG("%s: TKIP Countermeasures disabled in %s\n", __FUNCTION__, "eCSR_ROAM_RESULT_MIC_ERROR_UNICAST");
+ DBGLOG("%s: TKIP Countermeasures disabled in %s\n", __func__, "eCSR_ROAM_RESULT_MIC_ERROR_UNICAST");
}
}
break;
@@ -670,11 +670,11 @@
if (btampContext->mTKIPCounterMeasures)
{
((IO80211Interface*) mNetworkIF)->postMessage(APPLE80211_M_MIC_ERROR_MCAST);
- DBGLOG("%s: TKIP Countermeasures in effect in %s\n", __FUNCTION__, "eCSR_ROAM_RESULT_MIC_ERROR_GROUP");
+ DBGLOG("%s: TKIP Countermeasures in effect in %s\n", __func__, "eCSR_ROAM_RESULT_MIC_ERROR_GROUP");
}
else
{
- DBGLOG("%s: TKIP Countermeasures disabled in %s\n", __FUNCTION__, "eCSR_ROAM_RESULT_MIC_ERROR_GROUP");
+ DBGLOG("%s: TKIP Countermeasures disabled in %s\n", __func__, "eCSR_ROAM_RESULT_MIC_ERROR_GROUP");
}
}
break;
@@ -684,7 +684,7 @@
}
switch (roamStatus) {
case eCSR_ROAM_ROAMING_START:
- DBGLOG("%s: In %s\n", __FUNCTION__, "eCSR_ROAM_ROAMING_START");
+ DBGLOG("%s: In %s\n", __func__, "eCSR_ROAM_ROAMING_START");
// This only gets called when CSR decides to roam on its own - due to lostlink.
// Apple still needs to be told.
if ((pCsrRoamInfo) && (pCsrRoamInfo->pConnectedProfile) && (pCsrRoamInfo->pConnectedProfile->pBssDesc))
@@ -692,7 +692,7 @@
memcpy(bssid.ether_addr_octet, pCsrRoamInfo->pConnectedProfile->pBssDesc->bssId,
sizeof(tSirMacAddr));
apple80211Interface->willRoam(&bssid); // Return result isn't significant
- DBGLOG("%s: willRoam returns\n", __FUNCTION__);
+ DBGLOG("%s: willRoam returns\n", __func__);
}
break;
@@ -708,7 +708,7 @@
roamAccepted = apple80211Interface->shouldRoam(&scanResult); // Return result is crucial
if (roamAccepted == true) {
// If the roam is acceptable, return SUCCESS
- DBGLOG("%s: shouldRoam returns \"acceptable\"\n", __FUNCTION__);
+ DBGLOG("%s: shouldRoam returns \"acceptable\"\n", __func__);
//#if 0
// Actually, before returning, immediately signal willRoam
// This is a workaround for a CSR bug. Eventually, when
@@ -716,13 +716,13 @@
// pointing to a tBssDescription, this work-around can be removed.
memcpy(bssid.ether_addr_octet, pCsrRoamInfo->pBssDesc->bssId, sizeof(tSirMacAddr));
apple80211Interface->willRoam(&bssid); // Return result isn't significant
- DBGLOG("%s: willRoam (called out of order) returns\n", __FUNCTION__);
+ DBGLOG("%s: willRoam (called out of order) returns\n", __func__);
DBGLOG(" with BSSID = " MAC_ADDR_STRING(bssid.ether_addr_octet));
//#endif
return eHAL_STATUS_SUCCESS;
} else {
// If the roam is NOT acceptable, return FAILURE
- DBGLOG("%s: shouldRoam returns \"NOT acceptable\"\n", __FUNCTION__);
+ DBGLOG("%s: shouldRoam returns \"NOT acceptable\"\n", __func__);
return eHAL_STATUS_FAILURE;
}
}
@@ -735,13 +735,13 @@
if (mLinkStatus != 0)
{
- DBGLOG("%s: marking link as down in %s\n", __FUNCTION__, "eCSR_ROAM_DISASSOCIATED");
+ DBGLOG("%s: marking link as down in %s\n", __func__, "eCSR_ROAM_DISASSOCIATED");
mLinkStatus = (tANI_U8) 0;
((IO80211Interface*) mNetworkIF)->setLinkState(kIO80211NetworkLinkDown);
}
else
{
- DBGLOG("%s: link already down in %s\n", __FUNCTION__, "eCSR_ROAM_DISASSOCIATED");
+ DBGLOG("%s: link already down in %s\n", __func__, "eCSR_ROAM_DISASSOCIATED");
}
}
break;
@@ -752,18 +752,18 @@
if (mLinkStatus != 0)
{
- DBGLOG("%s: marking link as down in %s\n", __FUNCTION__, "eCSR_ROAM_LOSTLINK");
+ DBGLOG("%s: marking link as down in %s\n", __func__, "eCSR_ROAM_LOSTLINK");
mLinkStatus = (tANI_U8) 0;
((IO80211Interface*) mNetworkIF)->setLinkState(kIO80211NetworkLinkDown);
}
else
{
- DBGLOG("%s: link already down in %s\n", __FUNCTION__, "eCSR_ROAM_LOSTLINK");
+ DBGLOG("%s: link already down in %s\n", __func__, "eCSR_ROAM_LOSTLINK");
}
break;
case eCSR_ROAM_ASSOCIATION_START:
- DBGLOG("%s: In %s\n", __FUNCTION__, "eCSR_ROAM_ASSOCIATION_START");
+ DBGLOG("%s: In %s\n", __func__, "eCSR_ROAM_ASSOCIATION_START");
#if 0
// This is the right place to call willRoam - for an "initial" association.
// But, unfortunately, when eCSR_ROAM_ASSOCIATION_START gets called,
@@ -772,14 +772,14 @@
if ((pCsrRoamInfo) && (pCsrRoamInfo->pBssDesc) {
memcpy(bssid.ether_addr_octet, pCsrRoamInfo->pBssDesc->bssId, 6);
apple80211Interface->willRoam(&bssid); // Return result isn't significant
- DBGLOG("%s: willRoam returns\n", __FUNCTION__);
+ DBGLOG("%s: willRoam returns\n", __func__);
DBGLOG(" with BSSID = " MAC_ADDR_STRING(bssid.ether_addr_octet));
}
#endif //0
break;
case eCSR_ROAM_ASSOCIATION_COMPLETION:
- DBGLOG("%s: In %s\n", __FUNCTION__, "eCSR_ROAM_ASSOCIATION_COMPLETION");
+ DBGLOG("%s: In %s\n", __func__, "eCSR_ROAM_ASSOCIATION_COMPLETION");
break;
case eCSR_ROAM_MIC_ERROR_IND: // Handled in eCSR_ROAM_RESULT_MIC_ERROR_UNICAST and GROUP, above
@@ -863,11 +863,11 @@
if ((pBapHCIPhysLinkCreate == NULL) || (NULL == btampContext))
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR, "%s: btampHandle value: %x, pBapHCIPhysLinkCreate is %x",
- __FUNCTION__, btampHandle, pBapHCIPhysLinkCreate);
+ __func__, btampHandle, pBapHCIPhysLinkCreate);
return VOS_STATUS_E_FAULT;
}
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s: btampHandle value: %x", __FUNCTION__, btampHandle);
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s: btampHandle value: %x", __func__, btampHandle);
if(DISCONNECTED != instanceVar->stateVar)
{
@@ -893,7 +893,7 @@
&btampContext, /* Handle to return per assoc btampContext value in */
BT_INITIATOR); /* BT_INITIATOR */
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s: btampContext value: %x", __FUNCTION__, btampContext);
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s: btampContext value: %x", __func__, btampContext);
/* Handle event */
vosStatus = btampFsm(btampContext, &bapEvent, &status);
@@ -966,11 +966,11 @@
if ((pBapHCIPhysLinkAccept == NULL) || (NULL == btampContext))
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR, "%s: btampHandle value: %x, pBapHCIPhysLinkAccept is %x",
- __FUNCTION__, btampHandle, pBapHCIPhysLinkAccept);
+ __func__, btampHandle, pBapHCIPhysLinkAccept);
return VOS_STATUS_E_FAULT;
}
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s: btampHandle value: %x", __FUNCTION__, btampHandle);
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s: btampHandle value: %x", __func__, btampHandle);
instanceVar = &(btampContext->bapPhysLinkMachine);
if(DISCONNECTED != instanceVar->stateVar)
@@ -997,7 +997,7 @@
&btampContext, /* Handle to return per assoc btampContext value in */
BT_RESPONDER); /* BT_RESPONDER */
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s: btampContext value: %x", __FUNCTION__, btampContext);
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s: btampContext value: %x", __func__, btampContext);
/* Handle event */
vosStatus = btampFsm(btampContext, &bapEvent, &status);
@@ -1067,7 +1067,7 @@
return VOS_STATUS_E_FAULT;
}
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s: btampHandle value: %x", __FUNCTION__, btampHandle);
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s: btampHandle value: %x", __func__, btampHandle);
/* Validate the Physical link handle */
if (pBapHCIPhysLinkDisconnect->phy_link_handle != btampContext->phy_link_handle)
@@ -1086,7 +1086,7 @@
bapEvent.event = eWLAN_BAP_HCI_PHYSICAL_LINK_DISCONNECT;
bapEvent.params = pBapHCIPhysLinkDisconnect;
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s: btampContext value: %x", __FUNCTION__, btampContext);
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s: btampContext value: %x", __func__, btampContext);
/* Handle event */
vosStatus = btampFsm(btampContext, &bapEvent, &status);
@@ -1172,7 +1172,7 @@
}
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s: btampHandle value: %x", __FUNCTION__, btampHandle);
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s: btampHandle value: %x", __func__, btampHandle);
/* Validate the BAP state to accept the logical link request
Logical Link create/accept requests are allowed only in
@@ -1362,7 +1362,7 @@
}
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s: btampHandle value: %x", __FUNCTION__, btampHandle);
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s: btampHandle value: %x", __func__, btampHandle);
/* Validate the BAP state to accept the logical link request
Logical Link create/accept requests are allowed only in
@@ -1545,7 +1545,7 @@
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
"Critical error: Invalid input parameter on %s",
- __FUNCTION__);
+ __func__);
return VOS_STATUS_E_FAULT;
}
@@ -1556,7 +1556,7 @@
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
"Critical error: Invalid input parameter on %s",
- __FUNCTION__);
+ __func__);
/* Fill in the event code to propagate the event notification to BRM
BRM generates the Command status Event based on this.*/
pBapHCIEvent->bapHCIEventCode = BTAMP_TLV_HCI_DISCONNECT_LOGICAL_LINK_COMPLETE_EVENT;
@@ -1570,7 +1570,7 @@
#ifdef BAP_DEBUG
/* Trace the tBtampCtx being passed in. */
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH,
- "WLAN BAP Context Monitor: btampContext value = %x in %s:%d", btampContext, __FUNCTION__, __LINE__ );
+ "WLAN BAP Context Monitor: btampContext value = %x in %s:%d", btampContext, __func__, __LINE__ );
#endif //BAP_DEBUG
bapHCIEvent.bapHCIEventCode = BTAMP_TLV_HCI_COMMAND_STATUS_EVENT;
@@ -1600,7 +1600,7 @@
#ifdef BAP_DEBUG
/* Log the error. */
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "%s:%d Invalid Logical Link handle(should be) = %d(%d)", __FUNCTION__, __LINE__,
+ "%s:%d Invalid Logical Link handle(should be) = %d(%d)", __func__, __LINE__,
pBapHCILogLinkDisconnect->log_link_handle, pLogLinkContext->log_link_handle);
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
" Logical Link index = %d", log_link_index);
@@ -1691,7 +1691,7 @@
(pBapHCIEvent == NULL))
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "%s: Null Parameters Not allowed", __FUNCTION__);
+ "%s: Null Parameters Not allowed", __func__);
return VOS_STATUS_E_FAULT;
}
@@ -1805,7 +1805,7 @@
(pBapHCIEvent == NULL))
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "%s: Null Parameters Not allowed", __FUNCTION__);
+ "%s: Null Parameters Not allowed", __func__);
return VOS_STATUS_E_FAULT;
}
@@ -1813,7 +1813,7 @@
index_for_logLinkHandle = pBapHCIFlowSpecModify->log_link_handle >> 8; /* Return the logical link index here */
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO,
- " %s:index_for_logLinkHandle=%d", __FUNCTION__,index_for_logLinkHandle);
+ " %s:index_for_logLinkHandle=%d", __func__,index_for_logLinkHandle);
bapHCIEvent.bapHCIEventCode = BTAMP_TLV_HCI_COMMAND_STATUS_EVENT;
bapHCIEvent.u.btampCommandStatusEvent.present = 1;
@@ -1879,7 +1879,7 @@
if (btampContext == NULL)
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "%s: Null Parameters Not allowed", __FUNCTION__);
+ "%s: Null Parameters Not allowed", __func__);
return;
}
diff --git a/CORE/BAP/src/bapApiLinkSupervision.c b/CORE/BAP/src/bapApiLinkSupervision.c
index b51b3b6..5bdbbda 100644
--- a/CORE/BAP/src/bapApiLinkSupervision.c
+++ b/CORE/BAP/src/bapApiLinkSupervision.c
@@ -131,7 +131,7 @@
if( !VOS_IS_STATUS_SUCCESS( vosStatus ) )
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "%s: failed to reserve size = %d\n",__FUNCTION__, size );
+ "%s: failed to reserve size = %d\n",__func__, size );
vos_pkt_return_packet( pPacket );
}
}
@@ -217,7 +217,7 @@
if ( NULL == pBtampCtx)
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "Invalid BAP handle value in %s", __FUNCTION__);
+ "Invalid BAP handle value in %s", __func__);
return VOS_STATUS_E_FAULT;
}
@@ -243,7 +243,7 @@
else
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO,
- "%s:AcquireLSPacket failed\n",__FUNCTION__);
+ "%s:AcquireLSPacket failed\n",__func__);
pBtampCtx->lsReqPacket = NULL;
return vosStatus;
}
@@ -256,7 +256,7 @@
else
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO,
- "%s:AcquireLSPacket failed\n",__FUNCTION__);
+ "%s:AcquireLSPacket failed\n",__func__);
pBtampCtx->lsRepPacket = NULL;
return vosStatus;
}
@@ -266,7 +266,7 @@
if ( VOS_STATUS_SUCCESS != vosStatus )
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO,
- "%s:vos_pkt_get_length error",__FUNCTION__);
+ "%s:vos_pkt_get_length error",__func__);
return VOS_STATUS_E_FAULT;
}
pBtampCtx->lsPktln = lsPktln;
@@ -280,7 +280,7 @@
else
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO,
- "%s:No LS configured for infinite",__FUNCTION__);
+ "%s:No LS configured for infinite",__func__);
}
return vosStatus;
@@ -321,11 +321,11 @@
if ( NULL == pBtampCtx)
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "Invalid BAP handle value in %s", __FUNCTION__);
+ "Invalid BAP handle value in %s", __func__);
return VOS_STATUS_E_FAULT;
}
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "In: %s", __FUNCTION__);
+ "In: %s", __func__);
vosStatus = WLANBAP_StopLinkSupervisionTimer(pBtampCtx);
@@ -394,12 +394,12 @@
if ( NULL == pBtampCtx)
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "Invalid BAP handle value in %s", __FUNCTION__);
+ "Invalid BAP handle value in %s", __func__);
return VOS_STATUS_E_FAULT;
}
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "In %s Received RxProtoType=%x", __FUNCTION__,RxProtoType);
+ "In %s Received RxProtoType=%x", __func__,RxProtoType);
vos_pkt_extract_data(vosRxLsBuff,0,(v_VOID_t*)&w8023Header,&HeaderLen);
if ( !(vos_mem_compare( w8023Header.vDA, pBtampCtx->self_mac_addr, VOS_MAC_ADDR_SIZE)
@@ -407,7 +407,7 @@
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "MAC address mismatch in %s", __FUNCTION__);
+ "MAC address mismatch in %s", __func__);
return VOS_STATUS_E_FAULT;
}
@@ -416,7 +416,7 @@
if ( VOS_STATUS_SUCCESS != vosStatus)
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "Failed to free VOS packet in %s", __FUNCTION__);
+ "Failed to free VOS packet in %s", __func__);
return VOS_STATUS_E_FAULT;
}
@@ -496,7 +496,7 @@
else
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO,
- "%s:AcquireLSPacket failed\n",__FUNCTION__);
+ "%s:AcquireLSPacket failed\n",__func__);
bapContext->lsReqPacket = NULL;
return vosStatus;
}
@@ -511,13 +511,13 @@
else
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO,
- "%s:AcquireLSPacket failed\n",__FUNCTION__);
+ "%s:AcquireLSPacket failed\n",__func__);
bapContext->lsRepPacket = NULL;
return vosStatus;
}
}
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO,
- "%s:Returned Vos Packet:%x\n",__FUNCTION__, pPacket );
+ "%s:Returned Vos Packet:%x\n",__func__, pPacket );
vos_pkt_return_packet( pPacket );
@@ -568,7 +568,7 @@
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "In : %s protoType=%x", __FUNCTION__,protoType);
+ "In : %s protoType=%x", __func__,protoType);
// Retrieve the VOSS context
pvosGCtx = pBtampCtx->pvosGCtx;
diff --git a/CORE/BAP/src/bapApiStatus.c b/CORE/BAP/src/bapApiStatus.c
index 75e3012..30c0862 100644
--- a/CORE/BAP/src/bapApiStatus.c
+++ b/CORE/BAP/src/bapApiStatus.c
@@ -243,14 +243,14 @@
/*- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -*/
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH,
- "%s: btampHandle value: %x", __FUNCTION__, btampHandle);
+ "%s: btampHandle value: %x", __func__, btampHandle);
/* Validate params */
if ((NULL == btampHandle) || (NULL == pBapHCIReadLinkQuality) ||
(NULL == pBapHCIEvent))
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH,
- "Invalid input parameters in %s", __FUNCTION__);
+ "Invalid input parameters in %s", __func__);
return VOS_STATUS_E_FAULT;
}
@@ -266,7 +266,7 @@
if (phyLinkHandle != btampContext->phy_link_handle)
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH,
- "Invalid Physical link handle in %s", __FUNCTION__);
+ "Invalid Physical link handle in %s", __func__);
pBapHCIEvent->u.btampCommandCompleteEvent.cc_event.Read_Link_Quality.status
= WLANBAP_ERROR_INVALID_HCI_CMND_PARAM;
}
@@ -340,14 +340,14 @@
/*- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -*/
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH,
- "%s: btampHandle value: %x", __FUNCTION__, btampHandle);
+ "%s: btampHandle value: %x", __func__, btampHandle);
/* Validate params */
if ((NULL == btampHandle) || (NULL == pBapHCIReadRSSI) ||
(NULL == pBapHCIEvent))
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH,
- "Invalid input parameters in %s", __FUNCTION__);
+ "Invalid input parameters in %s", __func__);
return VOS_STATUS_E_FAULT;
}
@@ -363,7 +363,7 @@
if (phyLinkHandle != btampContext->phy_link_handle)
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH,
- "Invalid Physical link handle in %s", __FUNCTION__);
+ "Invalid Physical link handle in %s", __func__);
pBapHCIEvent->u.btampCommandCompleteEvent.cc_event.Read_RSSI.status
= WLANBAP_ERROR_INVALID_HCI_CMND_PARAM;
}
@@ -449,7 +449,7 @@
return VOS_STATUS_E_FAULT;
}
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s: btampHandle value: %x", __FUNCTION__, btampHandle);
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s: btampHandle value: %x", __func__, btampHandle);
/* Format the command complete event to return... */
@@ -549,7 +549,7 @@
if ((pBapHCIReadLocalAMPAssoc == NULL) || (NULL == btampHandle))
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "param is NULL in %s", __FUNCTION__);
+ "param is NULL in %s", __func__);
return VOS_STATUS_E_FAULT;
}
@@ -557,14 +557,14 @@
if (NULL == hHal)
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "hHal is NULL in %s", __FUNCTION__);
+ "hHal is NULL in %s", __func__);
return VOS_STATUS_E_FAULT;
}
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s: btampHandle value: %x", __FUNCTION__, btampHandle);
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s: btampHandle value: %x", __func__, btampHandle);
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH,
- "In %s, phy_link_handle = %d", __FUNCTION__,
+ "In %s, phy_link_handle = %d", __func__,
pBapHCIReadLocalAMPAssoc->phy_link_handle);
/* Update the MAC address and SSID if in case the Read Local AMP Assoc
@@ -713,7 +713,7 @@
248,
&nConsumed);
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s: nConsumed value: %d", __FUNCTION__, nConsumed);
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s: nConsumed value: %d", __func__, nConsumed);
/* Format the command complete event to return... */
pBapHCIEvent->bapHCIEventCode = BTAMP_TLV_HCI_COMMAND_COMPLETE_EVENT;
@@ -725,7 +725,7 @@
if(pBapHCIReadLocalAMPAssoc->phy_link_handle !=
btampContext->phy_link_handle) {
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH,
- "%s: Wrong Physical Link handle in Read Local AMP Assoc cmd: current: %x, new: %x", __FUNCTION__,
+ "%s: Wrong Physical Link handle in Read Local AMP Assoc cmd: current: %x, new: %x", __func__,
btampContext->phy_link_handle,
pBapHCIReadLocalAMPAssoc->phy_link_handle);
@@ -798,13 +798,13 @@
return VOS_STATUS_E_FAULT;
}
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s: btampHandle value: %x", __FUNCTION__, btampHandle);
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s: btampHandle value: %x", __func__, btampHandle);
/* Fill in the event structure */
bapEvent.event = eWLAN_BAP_HCI_WRITE_REMOTE_AMP_ASSOC;
bapEvent.params = pBapHCIWriteRemoteAMPAssoc;
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s: btampContext value: %x", __FUNCTION__, btampContext);
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s: btampContext value: %x", __func__, btampContext);
/* Handle event */
vosStatus = btampFsm(btampContext, &bapEvent, &status);
diff --git a/CORE/BAP/src/bapApiTimer.c b/CORE/BAP/src/bapApiTimer.c
index 681800a..527ea96 100644
--- a/CORE/BAP/src/bapApiTimer.c
+++ b/CORE/BAP/src/bapApiTimer.c
@@ -151,7 +151,7 @@
if ( NULL == pBtampCtx )
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "Invalid BAP pointer in %s", __FUNCTION__);
+ "Invalid BAP pointer in %s", __func__);
return VOS_STATUS_E_FAULT;
}
@@ -206,7 +206,7 @@
if ( NULL == pBtampCtx )
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "Invalid BAP pointer in %s", __FUNCTION__);
+ "Invalid BAP pointer in %s", __func__);
return VOS_STATUS_E_FAULT;
}
@@ -255,7 +255,7 @@
if ( NULL == pBtampCtx )
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "Invalid BAP pointer in %s", __FUNCTION__);
+ "Invalid BAP pointer in %s", __func__);
return VOS_STATUS_E_FAULT;
}
@@ -308,7 +308,7 @@
if ( NULL == pBtampCtx )
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "Invalid BAP pointer in %s", __FUNCTION__);
+ "Invalid BAP pointer in %s", __func__);
return VOS_STATUS_E_FAULT;
}
@@ -361,7 +361,7 @@
if ( NULL == pBtampCtx )
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "WLAN BAP: Fatal error in %s", __FUNCTION__ );
+ "WLAN BAP: Fatal error in %s", __func__ );
VOS_ASSERT(0);
return;
}
@@ -427,7 +427,7 @@
if ( NULL == pBtampCtx )
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "Invalid BAP pointer in %s", __FUNCTION__);
+ "Invalid BAP pointer in %s", __func__);
return VOS_STATUS_E_FAULT;
}
@@ -482,7 +482,7 @@
if ( NULL == pBtampCtx )
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "Invalid BAP pointer in %s", __FUNCTION__);
+ "Invalid BAP pointer in %s", __func__);
return VOS_STATUS_E_FAULT;
}
@@ -531,7 +531,7 @@
if ( NULL == pBtampCtx )
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "Invalid BAP pointer in %s", __FUNCTION__);
+ "Invalid BAP pointer in %s", __func__);
return VOS_STATUS_E_FAULT;
}
@@ -582,7 +582,7 @@
if ( NULL == pBtampCtx )
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "Invalid BAP pointer in %s", __FUNCTION__);
+ "Invalid BAP pointer in %s", __func__);
return VOS_STATUS_E_FAULT;
}
@@ -635,19 +635,19 @@
if ( NULL == pBtampCtx )
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "WLAN BAP: Fatal error in %s", __FUNCTION__ );
+ "WLAN BAP: Fatal error in %s", __func__ );
VOS_ASSERT(0);
return;
}
phy_link_handle = pBtampCtx->phy_link_handle;
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "WLAN BAP:In LinkSupervision Timer handler %s", __FUNCTION__ );
+ "WLAN BAP:In LinkSupervision Timer handler %s", __func__ );
if(pBtampCtx->dataPktPending == VOS_TRUE)
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "%s: Data seen. Do nothing", __FUNCTION__ );
+ "%s: Data seen. Do nothing", __func__ );
pBtampCtx->dataPktPending = VOS_FALSE;
pBtampCtx->lsReqPktPending = VOS_FALSE;
@@ -663,7 +663,7 @@
&& (pBtampCtx->retries == WLANBAP_LINK_SUPERVISION_RETRIES))
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "#########WLAN BAP: LinkSupervision Timed OUT######## %s", __FUNCTION__ );
+ "#########WLAN BAP: LinkSupervision Timed OUT######## %s", __func__ );
/*---------------------------------------------------------------------
Feed this timeout to the BTAMP FSM
@@ -680,7 +680,7 @@
else
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "%s: Resend the LS packet", __FUNCTION__ );
+ "%s: Resend the LS packet", __func__ );
/* If we have transmit pkt pending and the time out occurred,resend the ls packet */
WLANBAP_StopLinkSupervisionTimer(pBtampCtx);
@@ -734,7 +734,7 @@
if ( NULL == pBtampCtx )
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "Invalid BAP pointer in %s", __FUNCTION__);
+ "Invalid BAP pointer in %s", __func__);
return VOS_STATUS_E_FAULT;
}
@@ -785,7 +785,7 @@
if ( NULL == pBtampCtx )
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "Invalid BAP pointer in %s", __FUNCTION__);
+ "Invalid BAP pointer in %s", __func__);
return VOS_STATUS_E_FAULT;
}
@@ -854,7 +854,7 @@
if (uTxCompleted) {
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "wlan bap: %s Log Link handle - %d No Of Pkts - %d", __FUNCTION__,
+ "wlan bap: %s Log Link handle - %d No Of Pkts - %d", __func__,
pLogLinkContext->log_link_handle, uTxCompleted);
}
}
@@ -939,7 +939,7 @@
if (uTxCompleted) {
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "wlan bap: %s Log Link handle - %d No Of Pkts - %d", __FUNCTION__,
+ "wlan bap: %s Log Link handle - %d No Of Pkts - %d", __func__,
pLogLinkContext->log_link_handle, uTxCompleted);
}
}
@@ -1001,7 +1001,7 @@
if ( NULL == pBtampCtx )
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "WLAN BAP: Fatal error in %s", __FUNCTION__ );
+ "WLAN BAP: Fatal error in %s", __func__ );
VOS_ASSERT(0);
return;
}
@@ -1009,7 +1009,7 @@
#if 0 //BAP_DEBUG
/* Trace the tBtampCtx being passed in. */
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH,
- "WLAN BAP Context Monitor: pBtampCtx value = %x in %s:%d", pBtampCtx, __FUNCTION__, __LINE__ );
+ "WLAN BAP Context Monitor: pBtampCtx value = %x in %s:%d", pBtampCtx, __func__, __LINE__ );
#endif //BAP_DEBUG
if(WLANBAP_FLOW_CONTROL_MODE_BLOCK_BASED == pBtampCtx->ucDataTrafficMode)
diff --git a/CORE/BAP/src/bapModule.c b/CORE/BAP/src/bapModule.c
index e43c14c..65abd1e 100644
--- a/CORE/BAP/src/bapModule.c
+++ b/CORE/BAP/src/bapModule.c
@@ -571,7 +571,7 @@
if(NULL == halHandle)
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "halHandle is NULL in %s", __FUNCTION__);
+ "halHandle is NULL in %s", __func__);
return VOS_STATUS_E_FAULT;
}
@@ -659,14 +659,14 @@
&bapPhysLinkMachineInitial, /* BTAMPFSM_INSTANCEDATA_INIT; */
sizeof( pBtampCtx->bapPhysLinkMachine));
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s: Initializing State: %d", __FUNCTION__, bapPhysLinkMachineInitial.stateVar);
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s: Initialized State: %d", __FUNCTION__, pBtampCtx->bapPhysLinkMachine.stateVar);
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s: Initializing State: %d", __func__, bapPhysLinkMachineInitial.stateVar);
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s: Initialized State: %d", __func__, pBtampCtx->bapPhysLinkMachine.stateVar);
- //VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s: btampContext value: %x", __FUNCTION__, pBtampCtx);
+ //VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s: btampContext value: %x", __func__, pBtampCtx);
#ifdef BAP_DEBUG
/* Trace the tBtampCtx being passed in. */
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH,
- "WLAN BAP Context Monitor: pBtampCtx value = %x in %s:%d", pBtampCtx, __FUNCTION__, __LINE__ );
+ "WLAN BAP Context Monitor: pBtampCtx value = %x in %s:%d", pBtampCtx, __func__, __LINE__ );
#endif //BAP_DEBUG
@@ -852,7 +852,7 @@
if ( NULL == pBtampCtx)
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "Invalid BAP handle value in %s", __FUNCTION__);
+ "Invalid BAP handle value in %s", __func__);
return VOS_STATUS_E_FAULT;
}
@@ -1010,7 +1010,7 @@
if ( NULL == pBtampContext)
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "Invalid BAP handle value in %s", __FUNCTION__);
+ "Invalid BAP handle value in %s", __func__);
return VOS_STATUS_E_FAULT;
}
@@ -1086,7 +1086,7 @@
*pLog_link_handle = (i << 8) + ( v_U16_t ) phy_link_handle ; /* Return the logical link index here */
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO,
- " %s:*pLog_link_handle=%x", __FUNCTION__,*pLog_link_handle);
+ " %s:*pLog_link_handle=%x", __func__,*pLog_link_handle);
/*------------------------------------------------------------------------
Evaluate the Tx and Rx Flow specification for this logical link.
@@ -1096,7 +1096,7 @@
#ifdef BAP_DEBUG
/* Trace the tBtampCtx being passed in. */
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH,
- "WLAN BAP Context Monitor: pBtampContext value = %x in %s:%d", pBtampContext, __FUNCTION__, __LINE__ );
+ "WLAN BAP Context Monitor: pBtampContext value = %x in %s:%d", pBtampContext, __func__, __LINE__ );
#endif //BAP_DEBUG
/*------------------------------------------------------------------------
@@ -1206,7 +1206,7 @@
if (NULL == pBtampCtx)
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "pBtampCtx is NULL in %s", __FUNCTION__);
+ "pBtampCtx is NULL in %s", __func__);
return;
}
@@ -1215,7 +1215,7 @@
if (NULL == pMac)
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "pMac is NULL in %s", __FUNCTION__);
+ "pMac is NULL in %s", __func__);
return;
}
@@ -1291,7 +1291,7 @@
// Is re-entrancy protection needed for this?
if (needCoexPriority != gBapCoexPriority) {
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH,
- "Calling %s with needCoexPriority=%d.", __FUNCTION__, needCoexPriority);
+ "Calling %s with needCoexPriority=%d.", __func__, needCoexPriority);
gBapCoexPriority = needCoexPriority;
switch ( needCoexPriority)
@@ -1319,7 +1319,7 @@
default:
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
"%s: Invalid Coexistence priority request: %d",
- __FUNCTION__, needCoexPriority);
+ __func__, needCoexPriority);
}
}
@@ -1373,7 +1373,7 @@
/* Link supervision frame, process this frame */
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: link Supervision packet received over TL: %d, => BAP",
- __FUNCTION__, frameType);
+ __func__, frameType);
WLANBAP_RxProcLsPkt((ptBtampHandle)pBtampCtx,
pBtampCtx->phy_link_handle,
frameType,
@@ -1392,7 +1392,7 @@
default:
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
"%s: Invalid frametype from TL: %d, => BAP",
- __FUNCTION__, frameType);
+ __func__, frameType);
}
return ( VOS_STATUS_SUCCESS );
diff --git a/CORE/BAP/src/bapRsn8021xAuthFsm.c b/CORE/BAP/src/bapRsn8021xAuthFsm.c
index 7256c69..8baef0e 100644
--- a/CORE/BAP/src/bapRsn8021xAuthFsm.c
+++ b/CORE/BAP/src/bapRsn8021xAuthFsm.c
@@ -1397,7 +1397,7 @@
if (NULL == fsm)
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "fsm is NULL in %s", __FUNCTION__);
+ "fsm is NULL in %s", __func__);
return;
}
@@ -1417,7 +1417,7 @@
if (NULL == fsm)
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "fsm is NULL in %s", __FUNCTION__);
+ "fsm is NULL in %s", __func__);
return;
}
@@ -1445,7 +1445,7 @@
if ((pvosGCtx == NULL) || (NULL == pPacket))
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "param is NULL in %s", __FUNCTION__);
+ "param is NULL in %s", __func__);
return retVal;
}
@@ -1454,7 +1454,7 @@
if (NULL == ctx)
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "ctx is NULL in %s", __FUNCTION__);
+ "ctx is NULL in %s", __func__);
return retVal;
}
@@ -1463,7 +1463,7 @@
if (NULL == fsm)
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "fsm is NULL in %s", __FUNCTION__);
+ "fsm is NULL in %s", __func__);
return retVal;
}
@@ -1501,7 +1501,7 @@
if (NULL == ctx)
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "ctx is NULL in %s", __FUNCTION__);
+ "ctx is NULL in %s", __func__);
return ANI_ERROR;
}
@@ -1510,7 +1510,7 @@
if (NULL == fsm)
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "fsm is NULL in %s", __FUNCTION__);
+ "fsm is NULL in %s", __func__);
return ANI_ERROR;
}
diff --git a/CORE/BAP/src/bapRsn8021xSuppRsnFsm.c b/CORE/BAP/src/bapRsn8021xSuppRsnFsm.c
index 158afcd..c67065e 100644
--- a/CORE/BAP/src/bapRsn8021xSuppRsnFsm.c
+++ b/CORE/BAP/src/bapRsn8021xSuppRsnFsm.c
@@ -1021,7 +1021,7 @@
if ((pvosGCtx == NULL) || (NULL == pPacket))
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "param is NULL in %s", __FUNCTION__);
+ "param is NULL in %s", __func__);
return retVal;
}
@@ -1029,7 +1029,7 @@
if (NULL == ctx)
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "ctx is NULL in %s", __FUNCTION__);
+ "ctx is NULL in %s", __func__);
return retVal;
}
@@ -1038,7 +1038,7 @@
if (NULL == fsm)
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "fsm is NULL in %s", __FUNCTION__);
+ "fsm is NULL in %s", __func__);
return retVal;
}
@@ -1076,7 +1076,7 @@
if (pvosGCtx == NULL)
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "param is NULL in %s", __FUNCTION__);
+ "param is NULL in %s", __func__);
return ANI_ERROR;
}
@@ -1084,7 +1084,7 @@
if (NULL == ctx)
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "ctx is NULL in %s", __FUNCTION__);
+ "ctx is NULL in %s", __func__);
return ANI_ERROR;
}
@@ -1093,7 +1093,7 @@
if (NULL == fsm)
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "fsm is NULL in %s", __FUNCTION__);
+ "fsm is NULL in %s", __func__);
return ANI_ERROR;
}
diff --git a/CORE/BAP/src/bapRsnTxRx.c b/CORE/BAP/src/bapRsnTxRx.c
index a20cc2b..9502203 100644
--- a/CORE/BAP/src/bapRsnTxRx.c
+++ b/CORE/BAP/src/bapRsnTxRx.c
@@ -111,7 +111,7 @@
if (NULL == pvosGCtx)
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "pvosGCtx is NULL in %s", __FUNCTION__);
+ "pvosGCtx is NULL in %s", __func__);
return VOS_STATUS_E_FAULT;
}
@@ -120,7 +120,7 @@
if (NULL == btampContext)
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "btampContext is NULL in %s", __FUNCTION__);
+ "btampContext is NULL in %s", __func__);
return VOS_STATUS_E_FAULT;
}
@@ -129,7 +129,7 @@
if (NULL == fsm)
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "fsm is NULL in %s", __FUNCTION__);
+ "fsm is NULL in %s", __func__);
return VOS_STATUS_E_FAULT;
}
diff --git a/CORE/BAP/src/btampFsm.c b/CORE/BAP/src/btampFsm.c
index dc8d5c7..f5e5841 100644
--- a/CORE/BAP/src/btampFsm.c
+++ b/CORE/BAP/src/btampFsm.c
@@ -183,12 +183,12 @@
if (NULL == hHal)
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "hHal is NULL in %s", __FUNCTION__);
+ "hHal is NULL in %s", __func__);
return VOS_STATUS_E_FAULT;
}
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s: btampContext value: %x", __FUNCTION__, btampContext);
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s: btampContext value: %x", __func__, btampContext);
/* Fill in the event structure */
bapEvent.event = eWLAN_BAP_RSN_SUCCESS;
@@ -446,7 +446,7 @@
if (NULL == btampContext)
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "btampContext is NULL in %s", __FUNCTION__);
+ "btampContext is NULL in %s", __func__);
return VOS_STATUS_E_FAULT;
}
@@ -455,7 +455,7 @@
if (NULL == hHal)
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "hHal is NULL in %s", __FUNCTION__);
+ "hHal is NULL in %s", __func__);
return VOS_STATUS_E_FAULT;
}
@@ -474,7 +474,7 @@
{
pProfile->SSIDs.numOfSSIDs = 2;
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s: bssType = %s, SSID specified = %s\n", __FUNCTION__, "eCSR_BSS_TYPE_WDS_STA", convertBSSIDToSSID(btampContext->btamp_Remote_AMP_Assoc.HC_mac_addr));
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s: bssType = %s, SSID specified = %s\n", __func__, "eCSR_BSS_TYPE_WDS_STA", convertBSSIDToSSID(btampContext->btamp_Remote_AMP_Assoc.HC_mac_addr));
vos_mem_zero(pProfile->SSIDs.SSIDList[0].SSID.ssId,
sizeof(pProfile->SSIDs.SSIDList[0].SSID.ssId));
@@ -501,7 +501,7 @@
{
pProfile->SSIDs.numOfSSIDs = 1;
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s: bssType = %s, SSID specified = %s\n", __FUNCTION__, "eCSR_BSS_TYPE_WDS_AP", convertBSSIDToSSID(btampContext->self_mac_addr));
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s: bssType = %s, SSID specified = %s\n", __func__, "eCSR_BSS_TYPE_WDS_AP", convertBSSIDToSSID(btampContext->self_mac_addr));
vos_mem_zero(pProfile->SSIDs.SSIDList[0].SSID.ssId,
sizeof(pProfile->SSIDs.SSIDList[0].SSID.ssId));
@@ -527,7 +527,7 @@
{
pProfile->SSIDs.numOfSSIDs = 1;
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s: bssType = %s, SSID specified = %s\n", __FUNCTION__, "eCSR_BSS_TYPE_WDS_STA", convertBSSIDToSSID(btampContext->btamp_Remote_AMP_Assoc.HC_mac_addr));
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s: bssType = %s, SSID specified = %s\n", __func__, "eCSR_BSS_TYPE_WDS_STA", convertBSSIDToSSID(btampContext->btamp_Remote_AMP_Assoc.HC_mac_addr));
vos_mem_zero(pProfile->SSIDs.SSIDList[0].SSID.ssId,
sizeof(pProfile->SSIDs.SSIDList[0].SSID.ssId));
@@ -766,7 +766,7 @@
if (NULL == btampContext)
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "btampContext is NULL in %s", __FUNCTION__);
+ "btampContext is NULL in %s", __func__);
return VOS_STATUS_E_FAULT;
}
@@ -775,7 +775,7 @@
if (NULL == hHal)
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "hHal is NULL in %s", __FUNCTION__);
+ "hHal is NULL in %s", __func__);
return VOS_STATUS_E_FAULT;
}
@@ -806,10 +806,10 @@
//fail the HCI Create Physical Link
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH,
- "In %s, amp_assoc_remaining_length = %d", __FUNCTION__,
+ "In %s, amp_assoc_remaining_length = %d", __func__,
pBapHCIWriteRemoteAMPAssoc->amp_assoc_remaining_length);
#if 0
- DUMPLOG(1, __FUNCTION__, "amp_assoc_fragment",
+ DUMPLOG(1, __func__, "amp_assoc_fragment",
pBapHCIWriteRemoteAMPAssoc->amp_assoc_fragment,
64);
#endif //0
@@ -824,7 +824,7 @@
/* Unknown or Reserved TLVs are allowed in the write AMP assoc fragment */
if ((BTAMP_PARSE_SUCCESS != parseStatus ) && (BTAMP_UNKNOWN_TLVS != parseStatus))
{
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, parseStatus = %d", __FUNCTION__, parseStatus);
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, parseStatus = %d", __func__, parseStatus);
*status = WLANBAP_ERROR_INVALID_HCI_CMND_PARAM;
return VOS_STATUS_E_BADMSG;
}
@@ -945,7 +945,7 @@
else
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "sme_OpenSession failed in %s", __FUNCTION__);
+ "sme_OpenSession failed in %s", __func__);
*status = WLANBAP_ERROR_NO_CNCT;
return VOS_STATUS_E_FAILURE;
}
@@ -962,7 +962,7 @@
if(VOS_STATUS_E_INVAL == vosStatus)
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "Incorrect channel to create AMP link %s", __FUNCTION__);
+ "Incorrect channel to create AMP link %s", __func__);
*status = WLANBAP_ERROR_NO_SUITABLE_CHANNEL;
return VOS_STATUS_E_INVAL;
}
@@ -1180,7 +1180,7 @@
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
"%s: WLANTL_RegisterSTAClient() failed to register. Status= %d [0x%08lX]",
- __FUNCTION__, vosStatus, vosStatus );
+ __func__, vosStatus, vosStatus );
}
if ( ! btampContext->ucSecEnabled )
@@ -1408,7 +1408,7 @@
#ifdef BAP_DEBUG
/* Trace the tBtampCtx being passed in. */
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH,
- "WLAN BAP Context Monitor: btampContext value = %x in %s:%d", btampContext, __FUNCTION__, __LINE__ );
+ "WLAN BAP Context Monitor: btampContext value = %x in %s:%d", btampContext, __func__, __LINE__ );
#endif //BAP_DEBUG
/* Loop disconnecting all Logical Links on this Physical Link */
@@ -1420,7 +1420,7 @@
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
"WLAN BAP: Deleting logical link entry %d in %s", i,
- __FUNCTION__);
+ __func__);
/* Mark this Logical Link index value as free */
pLogLinkContext->present = VOS_FALSE;
@@ -1607,7 +1607,7 @@
ieLen,
&dot11BeaconIEs);
- //DUMPLOG(9, __FUNCTION__, "dot11BeaconIEs", &dot11BeaconIEs, 64);
+ //DUMPLOG(9, __func__, "dot11BeaconIEs", &dot11BeaconIEs, 64);
pDot11SSID = &dot11BeaconIEs.SSID;
@@ -1617,7 +1617,7 @@
if (pDot11SSID->present )
{
- //DUMPLOG(10, __FUNCTION__, "pDot11SSID present", pDot11SSID, 64);
+ //DUMPLOG(10, __func__, "pDot11SSID present", pDot11SSID, 64);
btampContext->assocSsidLen = pDot11SSID->num_ssid;
vos_mem_copy(btampContext->assocSsid,
@@ -1644,7 +1644,7 @@
if (pDot11RSN->present )
{
- //DUMPLOG(10, __FUNCTION__, "pDot11RSN present", pDot11RSN, 64);
+ //DUMPLOG(10, __func__, "pDot11RSN present", pDot11RSN, 64);
//The 802.11 BT-AMP PAL only supports WPA2-PSK
if (!vos_mem_compare(pRSNOui02, // RSN-PSK
@@ -1717,7 +1717,7 @@
if (NULL == hHal)
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "hHal is NULL in %s", __FUNCTION__);
+ "hHal is NULL in %s", __func__);
return VOS_STATUS_E_FAULT;
}
@@ -1736,7 +1736,7 @@
if((msg==(BTAMPFSM_EVENT_T)eWLAN_BAP_HCI_PHYSICAL_LINK_CREATE))
{
/*Transition from DISCONNECTED to S1 (both without substates)*/
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __FUNCTION__, "DISCONNECTED", "S1");
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __func__, "DISCONNECTED", "S1");
#if 0
/* This will have issues in multisession. Need not close the session */
@@ -1752,14 +1752,14 @@
/* Set BAP device role */
vosStatus = gotoS1( btampContext, bapEvent, BT_INITIATOR, status);
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, cmd status is %d", __FUNCTION__, *status);
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, cmd status is %d", __func__, *status);
/*Advance outer statevar */
btampfsmChangeToState(instanceVar,S1);
}
else if((msg==(BTAMPFSM_EVENT_T)eWLAN_BAP_HCI_PHYSICAL_LINK_ACCEPT))
{
/*Transition from DISCONNECTED to S1 (both without substates)*/
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __FUNCTION__, "DISCONNECTED", "S1");
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __func__, "DISCONNECTED", "S1");
#if 0
if(btampContext->isBapSessionOpen == TRUE)
@@ -1779,7 +1779,7 @@
}
else
{
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, in state %s, invalid event msg %d", __FUNCTION__, "DISCONNECTED", msg);
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, in state %s, invalid event msg %d", __func__, "DISCONNECTED", msg);
/* Intentionally left blank */
}
break;
@@ -1789,7 +1789,7 @@
) && (btampContext->BAPDeviceRole == BT_INITIATOR && !(CHANNEL_NOT_SELECTED)))
{
/*Transition from S1 to STARTING (both without substates)*/
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __FUNCTION__, "S1", "STARTING");
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __func__, "S1", "STARTING");
/*Action code for transition */
vosStatus = determineChan(btampContext, BT_INITIATOR, &channel, status);
@@ -1805,7 +1805,7 @@
else if((msg==(BTAMPFSM_EVENT_T)eWLAN_BAP_TIMER_CONNECT_ACCEPT_TIMEOUT))
{
/*Transition from S1 to DISCONNECTED (both without substates)*/
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __FUNCTION__, "S1", "DISCONNECTED");
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __func__, "S1", "DISCONNECTED");
/*Action code for transition */
/* Set everything back as dis-connected */
@@ -1818,7 +1818,7 @@
else if((msg==(BTAMPFSM_EVENT_T)eWLAN_BAP_HCI_PHYSICAL_LINK_DISCONNECT))
{
/*Transition from S1 to DISCONNECTED (both without substates)*/
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __FUNCTION__, "S1", "DISCONNECTED");
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __func__, "S1", "DISCONNECTED");
/*Action code for transition */
gotoDisconnected(btampContext);
@@ -1836,7 +1836,7 @@
) && (btampContext->BAPDeviceRole == BT_RESPONDER))
{
/*Transition from S1 to STARTING (both without substates)*/
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __FUNCTION__, "S1", "STARTING");
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __func__, "S1", "STARTING");
/*Action code for transition */
//determineChan(BT_RESPONDER);
@@ -1855,7 +1855,7 @@
) && (btampContext->BAPDeviceRole == BT_INITIATOR && CHANNEL_NOT_SELECTED))
{
/*Transition from S1 to SCANNING (both without substates)*/
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __FUNCTION__, "S1", "SCANNING");
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __func__, "S1", "SCANNING");
/*Action code for transition */
gotoScanning(btampContext, BT_RESPONDER, status);
@@ -1864,7 +1864,7 @@
}
else
{
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, in state %s, invalid event msg %d", __FUNCTION__, "S1", msg);
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, in state %s, invalid event msg %d", __func__, "S1", msg);
/* Intentionally left blank */
}
break;
@@ -1874,7 +1874,7 @@
) && (btampContext->BAPDeviceRole == BT_INITIATOR))
{
/*Transition from STARTING to CONNECTING (both without substates)*/
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __FUNCTION__, "STARTING", "CONNECTING");
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __func__, "STARTING", "CONNECTING");
btampfsmChangeToState(instanceVar,CONNECTING);//Moved to debug
@@ -1889,7 +1889,7 @@
else if((msg==(BTAMPFSM_EVENT_T)eWLAN_BAP_HCI_PHYSICAL_LINK_DISCONNECT))
{
/*Transition from STARTING to DISCONNECTING (both without substates)*/
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __FUNCTION__, "STARTING", "DISCONNECTING");
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __func__, "STARTING", "DISCONNECTING");
/*Action code for transition */
//csrRoamDisconnect();
@@ -1919,7 +1919,7 @@
else if((msg==(BTAMPFSM_EVENT_T)eWLAN_BAP_CHANNEL_SELECTION_FAILED))
{
/*Transition from STARTING to DISCONNECTED (both without substates)*/
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __FUNCTION__, "STARTING", "DISCONNECTED");
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __func__, "STARTING", "DISCONNECTED");
gotoDisconnected(btampContext);
/*Advance outer statevar */
@@ -1931,7 +1931,7 @@
) && (btampContext->BAPDeviceRole == BT_RESPONDER))
{
/*Transition from STARTING to CONNECTING (both without substates)*/
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __FUNCTION__, "STARTING", "CONNECTING");
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __func__, "STARTING", "CONNECTING");
/* Set the selected channel */
/*should have been already set */
@@ -1946,7 +1946,7 @@
else if((msg==(BTAMPFSM_EVENT_T)eWLAN_BAP_TIMER_CONNECT_ACCEPT_TIMEOUT))
{
/*Transition from STARTING to DISCONNECTING (both without substates)*/
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __FUNCTION__, "STARTING", "DISCONNECTING");
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __func__, "STARTING", "DISCONNECTING");
/*Action code for transition */
//csrRoamDisconnect();
@@ -1966,7 +1966,7 @@
else if((msg==(BTAMPFSM_EVENT_T)eWLAN_BAP_MAC_START_FAILS))
{
/*Transition from STARTING to DISCONNECTED (both without substates)*/
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __FUNCTION__, "STARTING", "DISCONNECTED");
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __func__, "STARTING", "DISCONNECTED");
/*Action code for transition */
gotoDisconnected(btampContext);
@@ -1976,7 +1976,7 @@
}
else
{
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, in state %s, invalid event msg %d", __FUNCTION__, "STARTING", msg);
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, in state %s, invalid event msg %d", __func__, "STARTING", msg);
/* Intentionally left blank */
}
break;
@@ -1986,8 +1986,8 @@
) && (btampContext->BAPDeviceRole == BT_RESPONDER))
{
/*Transition from CONNECTING to AUTHENTICATING (both without substates)*/
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __FUNCTION__, "CONNECTING", "AUTHENTICATING");
- //VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __FUNCTION__, "CONNECTING", "CONNECTED");
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __func__, "CONNECTING", "AUTHENTICATING");
+ //VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __func__, "CONNECTING", "CONNECTED");
gotoAuthenticating(btampContext);
/*Action code for transition */
@@ -2012,7 +2012,7 @@
else if((msg==(BTAMPFSM_EVENT_T)eWLAN_BAP_HCI_PHYSICAL_LINK_DISCONNECT))
{
/*Transition from CONNECTING to DISCONNECTING (both without substates)*/
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __FUNCTION__, "CONNECTING", "DISCONNECTING");
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __func__, "CONNECTING", "DISCONNECTING");
/*Action code for transition */
//csrRoamDisconnect();
@@ -2041,7 +2041,7 @@
) && !validAssocInd(btampContext, (tCsrRoamInfo *)bapEvent->params))
{
/*Transition from CONNECTING to DISCONNECTING (both without substates)*/
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __FUNCTION__, "CONNECTING", "DISCONNECTING");
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __func__, "CONNECTING", "DISCONNECTING");
/*Action code for transition */
//csrRoamDisconnect(DEAUTH);
//JEZ081120: Danlin points out that I could just ignore this
@@ -2068,9 +2068,9 @@
) && validAssocInd(btampContext, (tCsrRoamInfo *)bapEvent->params))
{
/*Transition from CONNECTING to VALIDATED (both without substates)*/
- //VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __FUNCTION__, "CONNECTING", "VALIDATED");
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __FUNCTION__, "CONNECTING", "AUTHENTICATING");
- //VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __FUNCTION__, "CONNECTING", "CONNECTED");
+ //VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __func__, "CONNECTING", "VALIDATED");
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __func__, "CONNECTING", "AUTHENTICATING");
+ //VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __func__, "CONNECTING", "CONNECTED");
/*Action code for transition */
// JEZ081027: This one is a pain. Since we are responding in the
@@ -2112,7 +2112,7 @@
else if((msg==(BTAMPFSM_EVENT_T)eWLAN_BAP_MAC_CONNECT_FAILED))
{
/*Transition from CONNECTING to DISCONNECTING (both without substates)*/
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __FUNCTION__, "CONNECTING", "DISCONNECTING");
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __func__, "CONNECTING", "DISCONNECTING");
/*Action code for transition */
sme_RoamDisconnect(hHal,
@@ -2134,7 +2134,7 @@
else if((msg==(BTAMPFSM_EVENT_T)eWLAN_BAP_TIMER_CONNECT_ACCEPT_TIMEOUT))
{
/*Transition from CONNECTING to DISCONNECTING (both without substates)*/
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __FUNCTION__, "CONNECTING", "DISCONNECTING");
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __func__, "CONNECTING", "DISCONNECTING");
/*Action code for transition */
//csrRoamDisconnect();
@@ -2153,7 +2153,7 @@
}
else
{
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, in state %s, invalid event msg %d", __FUNCTION__, "CONNECTING", msg);
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, in state %s, invalid event msg %d", __func__, "CONNECTING", msg);
/* Intentionally left blank */
}
break;
@@ -2163,7 +2163,7 @@
) && (btampContext->BAPDeviceRole == BT_RESPONDER))
{
/*Transition from AUTHENTICATING to KEYING (both without substates)*/
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __FUNCTION__, "AUTHENTICATING", "KEYING");
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __func__, "AUTHENTICATING", "KEYING");
/*Action code for transition */
//sme_RoamSetContext();
@@ -2185,7 +2185,7 @@
) && (btampContext->BAPDeviceRole == BT_INITIATOR))
{
/*Transition from AUTHENTICATING to KEYING (both without substates)*/
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __FUNCTION__, "AUTHENTICATING", "KEYING");
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __func__, "AUTHENTICATING", "KEYING");
/*Action code for transition */
//sme_RoamSetContext();
@@ -2206,7 +2206,7 @@
else if((msg==(BTAMPFSM_EVENT_T)eWLAN_BAP_TIMER_CONNECT_ACCEPT_TIMEOUT))
{
/*Transition from AUTHENTICATING to DISCONNECTING (both without substates)*/
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s ConnectAcceptTimeout", __FUNCTION__, "AUTHENTICATING", "DISCONNECTING");
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s ConnectAcceptTimeout", __func__, "AUTHENTICATING", "DISCONNECTING");
gotoDisconnecting(
btampContext,
@@ -2226,7 +2226,7 @@
else if((msg==(BTAMPFSM_EVENT_T)eWLAN_BAP_HCI_PHYSICAL_LINK_DISCONNECT))
{
/*Transition from AUTHENTICATING to DISCONNECTING (both without substates)*/
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s Physicallink Disconnect", __FUNCTION__, "AUTHENTICATING", "DISCONNECTING");
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s Physicallink Disconnect", __func__, "AUTHENTICATING", "DISCONNECTING");
/*Action code for transition */
//csrRoamDisconnect();
@@ -2253,7 +2253,7 @@
else if((msg==(BTAMPFSM_EVENT_T)eWLAN_BAP_RSN_FAILURE))
{
/*Transition from AUTHENTICATING to DISCONNECTING (both without substates)*/
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s RSN Failure", __FUNCTION__, "AUTHENTICATING", "DISCONNECTING");
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s RSN Failure", __func__, "AUTHENTICATING", "DISCONNECTING");
/*Action code for transition */
//csrRoamDisconnect(DEAUTH);
@@ -2273,7 +2273,7 @@
}
else
{
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, in state %s, invalid event msg %d", __FUNCTION__, "AUTHENTICATING", msg);
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, in state %s, invalid event msg %d", __func__, "AUTHENTICATING", msg);
/* Intentionally left blank */
}
break;
@@ -2282,7 +2282,7 @@
if((msg==(BTAMPFSM_EVENT_T)eWLAN_BAP_HCI_PHYSICAL_LINK_DISCONNECT))
{
/*Transition from CONNECTED to DISCONNECTING (both without substates)*/
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __FUNCTION__, "CONNECTED", "DISCONNECTING");
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __func__, "CONNECTED", "DISCONNECTING");
gotoDisconnecting(
btampContext,
@@ -2305,7 +2305,7 @@
{
/*Transition from CONNECTED to DISCONNECTING (both without substates)*/
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __FUNCTION__, "CONNECTED", "DISCONNECTING");
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __func__, "CONNECTED", "DISCONNECTING");
WLANBAP_DeInitLinkSupervision(( ptBtampHandle)btampContext);
gotoDisconnecting(
@@ -2323,7 +2323,7 @@
}
else
{
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, in state %s, invalid event msg %d", __FUNCTION__, "CONNECTED", msg);
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, in state %s, invalid event msg %d", __func__, "CONNECTED", msg);
/* Intentionally left blank */
}
break;
@@ -2336,12 +2336,12 @@
* Naw! Not necessary.
*/
case DISCONNECTING:
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, Entered DISCONNECTING:", __FUNCTION__);//Debug statement
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, Entered DISCONNECTING:", __func__);//Debug statement
if((msg==(BTAMPFSM_EVENT_T)eWLAN_BAP_MAC_READY_FOR_CONNECTIONS
) && (btampContext->gDiscRequested == VOS_TRUE))
{
/*Transition from DISCONNECTING to DISCONNECTED (both without substates)*/
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __FUNCTION__, "DISCONNECTING", "DISCONNECTED");
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __func__, "DISCONNECTING", "DISCONNECTED");
//Clear gDiscRequested;
btampContext->gDiscRequested = VOS_FALSE;
@@ -2372,14 +2372,14 @@
if ( VOS_STATUS_SUCCESS != vosStatus )
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO,
- "Unable to retrieve STA Id from BAP context and phy_link_handle in %s", __FUNCTION__);
+ "Unable to retrieve STA Id from BAP context and phy_link_handle in %s", __func__);
return VOS_STATUS_E_FAULT;
}
WLANTL_ClearSTAClient(btampContext->pvosGCtx, ucSTAId);
// gotoDisconnected(btampContext);
- // VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s:In DISCONNECTING-changing outer state var to DISCONNECTED", __FUNCTION__);
+ // VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s:In DISCONNECTING-changing outer state var to DISCONNECTED", __func__);
/*Advance outer statevar */
// btampfsmChangeToState(instanceVar,DISCONNECTED);
@@ -2392,7 +2392,7 @@
/*Action code for transition */
gotoDisconnected(btampContext);
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s:In DISCONNECTING-changing outer state var to DISCONNECTED", __FUNCTION__);
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s:In DISCONNECTING-changing outer state var to DISCONNECTED", __func__);
/*Advance outer statevar */
btampfsmChangeToState(instanceVar,DISCONNECTED);
}
@@ -2400,7 +2400,7 @@
) && (btampContext->gNeedPhysLinkCompEvent == VOS_TRUE))
{
/*Transition from DISCONNECTING to DISCONNECTED (both without substates)*/
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s gNeedPhysLinkComp TRUE", __FUNCTION__, "DISCONNECTING", "DISCONNECTED");
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s gNeedPhysLinkComp TRUE", __func__, "DISCONNECTING", "DISCONNECTED");
if(btampContext->BAPDeviceRole == BT_INITIATOR)
{
if(!VOS_IS_STATUS_SUCCESS(vos_lock_acquire(&btampContext->bapLock)))
@@ -2427,7 +2427,7 @@
if ( VOS_STATUS_SUCCESS != vosStatus )
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO,
- "Unable to retrieve STA Id from BAP context and phy_link_handle in %s", __FUNCTION__);
+ "Unable to retrieve STA Id from BAP context and phy_link_handle in %s", __func__);
return VOS_STATUS_E_FAULT;
}
WLANTL_ClearSTAClient(btampContext->pvosGCtx, ucSTAId);
@@ -2445,7 +2445,7 @@
}
else
{
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, in state %s, invalid event msg %d", __FUNCTION__, "DISCONNECTING", msg);
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, in state %s, invalid event msg %d", __func__, "DISCONNECTING", msg);
/* Intentionally left blank */
}
break;
@@ -2454,7 +2454,7 @@
if((msg==(BTAMPFSM_EVENT_T)eWLAN_BAP_TIMER_CONNECT_ACCEPT_TIMEOUT))
{
/*Transition from KEYING to DISCONNECTING (both without substates)*/
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __FUNCTION__, "KEYING", "DISCONNECTING");
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __func__, "KEYING", "DISCONNECTING");
/*Action code for transition */
//csrRoamDisconnect();
@@ -2474,7 +2474,7 @@
else if((msg==(BTAMPFSM_EVENT_T)eWLAN_BAP_HCI_PHYSICAL_LINK_DISCONNECT))
{
/*Transition from KEYING to DISCONNECTING (both without substates)*/
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __FUNCTION__, "KEYING", "DISCONNECTING");
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __func__, "KEYING", "DISCONNECTING");
/*Action code for transition */
//csrRoamDisconnect();
@@ -2503,7 +2503,7 @@
else if((msg==(BTAMPFSM_EVENT_T)eWLAN_BAP_MAC_KEY_SET_SUCCESS))
{
/*Transition from KEYING to CONNECTED (both without substates)*/
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __FUNCTION__, "KEYING", "CONNECTED");
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __func__, "KEYING", "CONNECTED");
/*Action code for transition */
gotoConnected(btampContext);
@@ -2513,7 +2513,7 @@
}
else
{
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, in state %s, invalid event msg %d", __FUNCTION__, "KEYING", msg);
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, in state %s, invalid event msg %d", __func__, "KEYING", msg);
/* Intentionally left blank */
}
break;
@@ -2522,7 +2522,7 @@
if((msg==(BTAMPFSM_EVENT_T)eWLAN_BAP_MAC_SCAN_COMPLETE))
{
/*Transition from SCANNING to STARTING (both without substates)*/
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __FUNCTION__, "SCANNING", "STARTING");
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __func__, "SCANNING", "STARTING");
/*Action code for transition */
vosStatus = determineChan(btampContext, BT_INITIATOR, &channel, status);
@@ -2538,7 +2538,7 @@
else if((msg==(BTAMPFSM_EVENT_T)eWLAN_BAP_TIMER_CONNECT_ACCEPT_TIMEOUT))
{
/*Transition from SCANNING to DISCONNECTED (both without substates)*/
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __FUNCTION__, "SCANNING", "DISCONNECTED");
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __func__, "SCANNING", "DISCONNECTED");
/*Action code for transition */
gotoDisconnected(btampContext);
@@ -2550,7 +2550,7 @@
else if((msg==(BTAMPFSM_EVENT_T)eWLAN_BAP_HCI_PHYSICAL_LINK_DISCONNECT))
{
/*Transition from SCANNING to DISCONNECTED (both without substates)*/
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __FUNCTION__, "SCANNING", "DISCONNECTED");
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __func__, "SCANNING", "DISCONNECTED");
/*Action code for transition */
gotoDisconnected(btampContext);
@@ -2564,7 +2564,7 @@
}
else
{
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, in state %s, invalid event msg %d", __FUNCTION__, "SCANNING", msg);
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, in state %s, invalid event msg %d", __func__, "SCANNING", msg);
/* Intentionally left blank */
}
break;
@@ -2574,7 +2574,7 @@
) && (btampContext->BAPDeviceRole == BT_INITIATOR))
{
/*Transition from VALIDATED to AUTHENTICATING (both without substates)*/
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __FUNCTION__, "VALIDATED", "AUTHENTICATING");
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __func__, "VALIDATED", "AUTHENTICATING");
gotoAuthenticating(btampContext);
/*Action code for transition */
@@ -2585,7 +2585,7 @@
else if((msg==(BTAMPFSM_EVENT_T)eWLAN_BAP_TIMER_CONNECT_ACCEPT_TIMEOUT))
{
/*Transition from VALIDATED to DISCONNECTING (both without substates)*/
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __FUNCTION__, "VALIDATED", "DISCONNECTING");
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __func__, "VALIDATED", "DISCONNECTING");
/*Action code for transition */
//csrRoamDisconnect();
@@ -2605,7 +2605,7 @@
else if((msg==(BTAMPFSM_EVENT_T)eWLAN_BAP_HCI_PHYSICAL_LINK_DISCONNECT))
{
/*Transition from VALIDATED to DISCONNECTING (both without substates)*/
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __FUNCTION__, "VALIDATED", "DISCONNECTING");
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __func__, "VALIDATED", "DISCONNECTING");
/*Action code for transition */
//csrRoamDisconnect();
@@ -2633,13 +2633,13 @@
}
else
{
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, in state %s, invalid event msg %d", __FUNCTION__, "VALIDATED", msg);
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, in state %s, invalid event msg %d", __func__, "VALIDATED", msg);
/* Intentionally left blank */
}
break;
default:
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, invalid state %d", __FUNCTION__, instanceVar->stateVar);
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, invalid state %d", __func__, instanceVar->stateVar);
/*Intentionally left blank*/
break;
}
@@ -2657,7 +2657,7 @@
pMsg = vos_mem_malloc(sizeof(tAniBtAmpLogLinkReq));
if ( NULL == pMsg )
{
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR, "In %s, failed to allocate mem for req", __FUNCTION__);
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR, "In %s, failed to allocate mem for req", __func__);
return VOS_STATUS_E_NOMEM;
}
@@ -2672,7 +2672,7 @@
if(VOS_STATUS_SUCCESS != vos_mq_post_message(VOS_MQ_ID_SME, &msg))
{
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR, "In %s, failed to post msg to self", __FUNCTION__);
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR, "In %s, failed to post msg to self", __func__);
vos_mem_free(pMsg);
vosStatus = VOS_STATUS_E_FAILURE;
}
@@ -2694,14 +2694,14 @@
}
else
{
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR, "In %s, btampContext is NULL", __FUNCTION__);
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR, "In %s, btampContext is NULL", __func__);
return;
}
}
else
{
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR, "In %s, pBtAmpLogLinkReq is NULL", __FUNCTION__);
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR, "In %s, pBtAmpLogLinkReq is NULL", __func__);
}
return;
}
diff --git a/CORE/BAP/src/btampHCI.c b/CORE/BAP/src/btampHCI.c
index 093e22f..a5bec8e 100644
--- a/CORE/BAP/src/btampHCI.c
+++ b/CORE/BAP/src/btampHCI.c
@@ -618,7 +618,7 @@
{
#ifdef WLAN_BAPHCI_ENABLE_LOGGING
/*Log invalid len*/
- VOS_TRACE(VOS_MODULE_ID_BAP,VOS_TRACE_LEVEL_ERROR, "Invalid TLV len on %s", __FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_BAP,VOS_TRACE_LEVEL_ERROR, "Invalid TLV len on %s", __func__);
#endif
return BTAMP_INVALID_TLV_LENGTH;
}
@@ -671,7 +671,7 @@
{
#ifdef WLAN_BAPHCI_ENABLE_LOGGING
/*Log invalid len*/
- VOS_TRACE(VOS_MODULE_ID_BAP,VOS_TRACE_LEVEL_ERROR,"Invalid TLV len on %s", __FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_BAP,VOS_TRACE_LEVEL_ERROR,"Invalid TLV len on %s", __func__);
#endif
return BTAMP_INVALID_TLV_LENGTH;
}
@@ -704,7 +704,7 @@
{
#ifdef WLAN_BAPHCI_ENABLE_LOGGING
/*Log invalid len*/
- VOS_TRACE(VOS_MODULE_ID_BAP,VOS_TRACE_LEVEL_ERROR,"Invalid TLV len on %s", __FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_BAP,VOS_TRACE_LEVEL_ERROR,"Invalid TLV len on %s", __func__);
#endif
return BTAMP_INVALID_TLV_LENGTH;
}
@@ -738,7 +738,7 @@
{
#ifdef WLAN_BAPHCI_ENABLE_LOGGING
/*Log invalid len*/
- VOS_TRACE(VOS_MODULE_ID_BAP,VOS_TRACE_LEVEL_ERROR,"Invalid TLV len on %s", __FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_BAP,VOS_TRACE_LEVEL_ERROR,"Invalid TLV len on %s", __func__);
#endif
return BTAMP_INVALID_TLV_LENGTH;
}
@@ -777,7 +777,7 @@
{
#ifdef WLAN_BAPHCI_ENABLE_LOGGING
/*Log invalid len*/
- VOS_TRACE(VOS_MODULE_ID_BAP,VOS_TRACE_LEVEL_ERROR,"Invalid TLV len on %s", __FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_BAP,VOS_TRACE_LEVEL_ERROR,"Invalid TLV len on %s", __func__);
#endif
return BTAMP_INVALID_TLV_LENGTH;
}
@@ -830,7 +830,7 @@
#ifdef WLAN_BAPHCI_ENABLE_LOGGING
/*Log invalid len*/
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "Invalid TLV len on %s", __FUNCTION__);
+ "Invalid TLV len on %s", __func__);
#endif
return BTAMP_INVALID_TLV_LENGTH;
}
@@ -880,7 +880,7 @@
#ifdef WLAN_BAPHCI_ENABLE_LOGGING
/*Log invalid len*/
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "Invalid TLV len on %s", __FUNCTION__);
+ "Invalid TLV len on %s", __func__);
#endif
// return BTAMP_INVALID_TLV_LENGTH;
}
@@ -922,7 +922,7 @@
#ifdef WLAN_BAPHCI_ENABLE_LOGGING
/*Log invalid len*/
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "Invalid TLV len on %s", __FUNCTION__);
+ "Invalid TLV len on %s", __func__);
#endif
return BTAMP_INVALID_TLV_LENGTH;
}
@@ -1339,7 +1339,7 @@
#ifdef WLAN_BAPHCI_ENABLE_LOGGING
/*Log invalid len*/
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "Invalid TLV len on %s", __FUNCTION__);
+ "Invalid TLV len on %s", __func__);
#endif
// return BTAMP_INVALID_TLV_LENGTH;
}
@@ -1379,7 +1379,7 @@
#ifdef WLAN_BAPHCI_ENABLE_LOGGING
/*Log invalid len*/
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "Invalid TLV len on %s", __FUNCTION__);
+ "Invalid TLV len on %s", __func__);
#endif
return BTAMP_INVALID_TLV_LENGTH;
}
@@ -1444,7 +1444,7 @@
#ifdef WLAN_BAPHCI_ENABLE_LOGGING
/*Log invalid len*/
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "Invalid TLV len on %s", __FUNCTION__);
+ "Invalid TLV len on %s", __func__);
#endif
return BTAMP_INVALID_TLV_LENGTH;
}
@@ -1502,7 +1502,7 @@
#ifdef WLAN_BAPHCI_ENABLE_LOGGING
/*Log invalid len*/
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "Invalid TLV len on %s", __FUNCTION__);
+ "Invalid TLV len on %s", __func__);
#endif
// return BTAMP_INVALID_TLV_LENGTH;
}
@@ -1563,7 +1563,7 @@
#ifdef WLAN_BAPHCI_ENABLE_LOGGING
/*Log invalid len*/
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "Invalid TLV len on %s", __FUNCTION__);
+ "Invalid TLV len on %s", __func__);
#endif
return BTAMP_INVALID_TLV_LENGTH;
}
@@ -1626,7 +1626,7 @@
#ifdef WLAN_BAPHCI_ENABLE_LOGGING
/*Log invalid len*/
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "Invalid TLV len on %s", __FUNCTION__);
+ "Invalid TLV len on %s", __func__);
#endif
return BTAMP_INVALID_TLV_LENGTH;
}
@@ -1717,7 +1717,7 @@
#ifdef WLAN_BAPHCI_ENABLE_LOGGING
/*Log invalid len*/
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "Invalid TLV len on %s", __FUNCTION__);
+ "Invalid TLV len on %s", __func__);
#endif
return BTAMP_INVALID_TLV_LENGTH;
}
@@ -1868,7 +1868,7 @@
#ifdef WLAN_BAPHCI_ENABLE_LOGGING
/*Log invalid len*/
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "Invalid TLV len on %s", __FUNCTION__);
+ "Invalid TLV len on %s", __func__);
#endif
return BTAMP_INVALID_TLV_LENGTH;
}
@@ -1944,7 +1944,7 @@
#ifdef WLAN_BAPHCI_ENABLE_LOGGING
/*Log invalid len*/
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "Invalid TLV len on %s", __FUNCTION__);
+ "Invalid TLV len on %s", __func__);
#endif
return BTAMP_INVALID_TLV_LENGTH;
}
@@ -1992,7 +1992,7 @@
#ifdef WLAN_BAPHCI_ENABLE_LOGGING
/*Log invalid len*/
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "Invalid TLV len on %s", __FUNCTION__);
+ "Invalid TLV len on %s", __func__);
#endif
return BTAMP_INVALID_TLV_LENGTH;
}
@@ -2026,7 +2026,7 @@
#ifdef WLAN_BAPHCI_ENABLE_LOGGING
/*Log invalid len*/
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "Invalid TLV len on %s", __FUNCTION__);
+ "Invalid TLV len on %s", __func__);
#endif
return BTAMP_INVALID_TLV_LENGTH;
}
@@ -2056,7 +2056,7 @@
TLV Sanity check
-------------------------------------------------------------------------*/
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "Invalid TLV len on %s. tlvlen=%d.", __FUNCTION__, tlvlen);
+ "Invalid TLV len on %s. tlvlen=%d.", __func__, tlvlen);
#ifdef WLAN_BAPHCI_ENABLE_VALIDITY_CHECKING
if ( WLAN_BAP_PAL_READ_LOCAL_AMP_ASSOC_TLV_LEN != tlvlen )
@@ -2064,7 +2064,7 @@
#ifdef WLAN_BAPHCI_ENABLE_LOGGING
/*Log invalid len*/
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "Invalid TLV len on %s", __FUNCTION__);
+ "Invalid TLV len on %s", __func__);
#endif
// return BTAMP_INVALID_TLV_LENGTH;
}
@@ -2189,7 +2189,7 @@
#ifdef WLAN_BAPHCI_ENABLE_LOGGING
/*Log invalid len*/
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "Invalid TLV len on %s", __FUNCTION__);
+ "Invalid TLV len on %s", __func__);
#endif
return BTAMP_INVALID_TLV_LENGTH;
}
@@ -2237,7 +2237,7 @@
#ifdef WLAN_BAPHCI_ENABLE_LOGGING
/*Log invalid len*/
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "Invalid TLV len on %s", __FUNCTION__);
+ "Invalid TLV len on %s", __func__);
#endif
return BTAMP_INVALID_TLV_LENGTH;
}
@@ -2271,7 +2271,7 @@
#ifdef WLAN_BAPHCI_ENABLE_LOGGING
/*Log invalid len*/
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "Invalid TLV len on %s", __FUNCTION__);
+ "Invalid TLV len on %s", __func__);
#endif
return BTAMP_INVALID_TLV_LENGTH;
}
@@ -2302,14 +2302,14 @@
-------------------------------------------------------------------------*/
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "Invalid TLV len on %s. tlvlen=%d.", __FUNCTION__, tlvlen);
+ "Invalid TLV len on %s. tlvlen=%d.", __func__, tlvlen);
#ifdef WLAN_BAPHCI_ENABLE_VALIDITY_CHECKING
if ( WLAN_BAP_PAL_SET_EVENT_MASK2_TLV_LEN != tlvlen )
{
#ifdef WLAN_BAPHCI_ENABLE_LOGGING
/*Log invalid len*/
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "Invalid TLV len on %s", __FUNCTION__);
+ "Invalid TLV len on %s", __func__);
#endif
// return BTAMP_INVALID_TLV_LENGTH;
}
@@ -2344,7 +2344,7 @@
#ifdef WLAN_BAPHCI_ENABLE_LOGGING
/*Log invalid len*/
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "Invalid TLV len on %s", __FUNCTION__);
+ "Invalid TLV len on %s", __func__);
#endif
return BTAMP_INVALID_TLV_LENGTH;
}
@@ -2404,7 +2404,7 @@
#ifdef WLAN_BAPHCI_ENABLE_LOGGING
/*Log invalid len*/
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "Invalid TLV len on %s", __FUNCTION__);
+ "Invalid TLV len on %s", __func__);
#endif
return BTAMP_INVALID_TLV_LENGTH;
}
@@ -2441,7 +2441,7 @@
#ifdef WLAN_BAPHCI_ENABLE_LOGGING
/*Log invalid len*/
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "Invalid TLV len on %s", __FUNCTION__);
+ "Invalid TLV len on %s", __func__);
#endif
return BTAMP_INVALID_TLV_LENGTH;
}
@@ -2475,7 +2475,7 @@
#ifdef WLAN_BAPHCI_ENABLE_LOGGING
/*Log invalid len*/
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "Invalid TLV len on %s", __FUNCTION__);
+ "Invalid TLV len on %s", __func__);
#endif
return BTAMP_INVALID_TLV_LENGTH;
}
@@ -2508,7 +2508,7 @@
#ifdef WLAN_BAPHCI_ENABLE_LOGGING
/*Log invalid len*/
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "Invalid TLV len on %s", __FUNCTION__);
+ "Invalid TLV len on %s", __func__);
#endif
return BTAMP_INVALID_TLV_LENGTH;
}
@@ -2545,7 +2545,7 @@
#ifdef WLAN_BAPHCI_ENABLE_LOGGING
/*Log invalid len*/
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "Invalid TLV len on %s", __FUNCTION__);
+ "Invalid TLV len on %s", __func__);
#endif
return BTAMP_INVALID_TLV_LENGTH;
}
@@ -2585,7 +2585,7 @@
#ifdef WLAN_BAPHCI_ENABLE_LOGGING
/*Log invalid len*/
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "Invalid TLV len on %s", __FUNCTION__);
+ "Invalid TLV len on %s", __func__);
#endif
return BTAMP_INVALID_TLV_LENGTH;
}
@@ -2619,7 +2619,7 @@
#ifdef WLAN_BAPHCI_ENABLE_LOGGING
/*Log invalid len*/
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "Invalid TLV len on %s", __FUNCTION__);
+ "Invalid TLV len on %s", __func__);
#endif
return BTAMP_INVALID_TLV_LENGTH;
}
@@ -2653,7 +2653,7 @@
#ifdef WLAN_BAPHCI_ENABLE_LOGGING
/*Log invalid len*/
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "Invalid TLV len on %s", __FUNCTION__);
+ "Invalid TLV len on %s", __func__);
#endif
return BTAMP_INVALID_TLV_LENGTH;
}
@@ -2700,7 +2700,7 @@
#ifdef WLAN_BAPHCI_ENABLE_LOGGING
/*Log invalid len*/
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "Invalid TLV len on %s", __FUNCTION__);
+ "Invalid TLV len on %s", __func__);
#endif
return BTAMP_INVALID_TLV_LENGTH;
}
diff --git a/CORE/DXE/src/wlan_qct_dxe.c b/CORE/DXE/src/wlan_qct_dxe.c
index ef2b7d4..a1da1b2 100644
--- a/CORE/DXE/src/wlan_qct_dxe.c
+++ b/CORE/DXE/src/wlan_qct_dxe.c
@@ -438,7 +438,7 @@
wpt_uint8 channelLoop;
HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_INFO_LOW,
- "%s Enter", __FUNCTION__);
+ "%s Enter", __func__);
/* Whatever RIVA power condition try to wakeup RIVA through SMSM
* This will not simply wakeup RIVA
@@ -458,7 +458,7 @@
wpalMemoryFree(msgPtr);
HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_INFO_LOW,
- "%s Exit", __FUNCTION__);
+ "%s Exit", __func__);
return;
}
@@ -485,7 +485,7 @@
wpt_uint8 channelLoop;
HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_INFO_LOW,
- "%s Enter", __FUNCTION__);
+ "%s Enter", __func__);
/* Whatever RIVA power condition try to wakeup RIVA through SMSM
* This will not simply wakeup RIVA
@@ -517,7 +517,7 @@
}
HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_INFO_LOW,
- "%s Exit", __FUNCTION__);
+ "%s Exit", __func__);
return;
}
@@ -850,7 +850,7 @@
WLANDXE_DescCtrlBlkType *nextCtrlBlk = NULL;
HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_INFO_LOW,
- "%s Enter", __FUNCTION__);
+ "%s Enter", __func__);
/* Sanity check */
if((NULL == dxeCtrlBlk) || (NULL == channelEntry))
@@ -927,7 +927,7 @@
channelEntry->numFreeDesc++;
}
- HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_INFO_LOW,"%s Exit", __FUNCTION__);
+ HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_INFO_LOW,"%s Exit", __func__);
return status;
}
@@ -968,7 +968,7 @@
#endif /* WLANDXE_TEST_CHANNEL_ENABLE*/
HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_INFO_LOW,
- "%s Enter", __FUNCTION__);
+ "%s Enter", __func__);
/* Sanity Check */
if((NULL == dxeCtrlBlk) || (NULL == channelEntry))
@@ -1133,7 +1133,7 @@
}
HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_INFO_LOW,
- "%s Exit", __FUNCTION__);
+ "%s Exit", __func__);
return status;
}
@@ -1159,7 +1159,7 @@
WLANDXE_ChannelCBType *channelEntry = NULL;
HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_INFO_LOW,
- "%s Enter", __FUNCTION__);
+ "%s Enter", __func__);
for(idx = 0; idx < WDTS_CHANNEL_MAX; idx++)
{
@@ -1192,7 +1192,7 @@
wpalWriteRegister(WLANDXE_CCU_DXE_INT_SELECT, interruptPath);
HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_INFO_LOW,
- "%s Exit", __FUNCTION__);
+ "%s Exit", __func__);
return status;
}
@@ -1220,7 +1220,7 @@
wpt_uint32 registerData = 0;
HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_INFO_LOW,
- "%s Enter", __FUNCTION__);
+ "%s Enter", __func__);
/* START This core init is not needed for the integrated system */
/* Reset First */
@@ -1243,7 +1243,7 @@
dxeSetInterruptPath(dxeCtrlBlk);
HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_INFO_LOW,
- "%s Exit", __FUNCTION__);
+ "%s Exit", __func__);
return status;
}
@@ -1285,7 +1285,7 @@
WLANDXE_DescCtrlBlkType *currentCtrlBlk = NULL;
HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_INFO_LOW,
- "%s Enter", __FUNCTION__);
+ "%s Enter", __func__);
/* Sanity Check */
if((NULL == dxeCtrlBlk) || (NULL == channelEntry))
@@ -1384,7 +1384,7 @@
}
HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_INFO_LOW,
- "%s Exit", __FUNCTION__);
+ "%s Exit", __func__);
return status;
}
@@ -1417,7 +1417,7 @@
wpt_uint32 intMaskVal = 0;
HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_INFO_LOW,
- "%s Enter", __FUNCTION__);
+ "%s Enter", __func__);
channelEntry->extraConfig.chEnabled = eWLAN_PAL_TRUE;
channelEntry->extraConfig.chConfigured = eWLAN_PAL_TRUE;
@@ -1453,7 +1453,7 @@
}
HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_INFO_LOW,
- "%s Exit", __FUNCTION__);
+ "%s Exit", __func__);
return status;
}
@@ -1484,7 +1484,7 @@
wpt_uint32 intMaskVal = 0;
HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_INFO_LOW,
- "%s Enter", __FUNCTION__);
+ "%s Enter", __func__);
/* Sanity */
if((NULL == dxeCtrlBlk) || (NULL == channelEntry))
@@ -1517,7 +1517,7 @@
/* Stop Channel ??? */
HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_INFO_LOW,
- "%s Exit", __FUNCTION__);
+ "%s Exit", __func__);
return status;
}
@@ -1555,7 +1555,7 @@
WLANDXE_DescType *nextDescriptor = NULL;
HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_INFO_LOW,
- "%s Enter", __FUNCTION__);
+ "%s Enter", __func__);
/* Sanity */
if((NULL == dxeCtrlBlk) || (NULL == channelEntry))
@@ -1631,7 +1631,7 @@
#endif
HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_INFO_LOW,
- "%s Exit", __FUNCTION__);
+ "%s Exit", __func__);
return status;
}
@@ -1663,7 +1663,7 @@
wpt_status status = eWLAN_PAL_STATUS_SUCCESS;
HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_INFO_LOW,
- "%s Enter", __FUNCTION__);
+ "%s Enter", __func__);
/* Read Channel Status Register to know why INT Happen */
status = wpalReadRegister(channelEntry->channelRegister.chDXEStatusRegAddr,
@@ -1728,7 +1728,7 @@
}
HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_INFO_LOW,
- "%s Exit", __FUNCTION__);
+ "%s Exit", __func__);
return status;
}
@@ -2147,7 +2147,7 @@
wpt_uint32 invalidatedFound = 0;
HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_INFO_LOW,
- "%s Enter", __FUNCTION__);
+ "%s Enter", __func__);
/* Sanity Check */
if((NULL == dxeCtxt) || (NULL == channelEntry))
@@ -2253,7 +2253,7 @@
}
channelEntry->numFragmentCurrentChain = frameCount;
HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_INFO_LOW,
- "%s Exit", __FUNCTION__);
+ "%s Exit", __func__);
return status;
}
@@ -2437,7 +2437,7 @@
{
HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_WARN,
"%s Riva is in %d, Just Pull frames without any register touch ",
- __FUNCTION__, dxeCtxt->hostPowerState);
+ __func__, dxeCtxt->hostPowerState);
/* Not to touch any register, just pull frame directly from chain ring
* First high priority */
@@ -2649,7 +2649,7 @@
}
HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_INFO_LOW,
- "%s Exit", __FUNCTION__);
+ "%s Exit", __func__);
return;
}
@@ -2682,7 +2682,7 @@
WLANDXE_ChannelCBType *channelCb = NULL;
HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_INFO_LOW,
- "%s Enter", __FUNCTION__);
+ "%s Enter", __func__);
/* Sanity Check */
if(NULL == rxPktAvailMsg)
@@ -2838,7 +2838,7 @@
#endif /* FEATURE_R33D */
HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_INFO_LOW,
- "%s Enter", __FUNCTION__);
+ "%s Enter", __func__);
if(WLANDXE_POWER_STATE_BMPS == tempDxeCtrlBlk->hostPowerState)
{
@@ -3020,7 +3020,7 @@
channelEntry->headCtrlBlk = currentCtrlBlk;
HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_INFO_LOW,
- "%s Exit", __FUNCTION__);
+ "%s Exit", __func__);
return status;
}
@@ -3172,7 +3172,7 @@
channelEntry->headCtrlBlk = currentCtrlBlk;
HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_INFO_LOW,
- "%s Exit", __FUNCTION__);
+ "%s Exit", __func__);
return status;
}
@@ -3205,7 +3205,7 @@
unsigned int *lowThreshold = NULL;
HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_INFO_LOW,
- "%s Enter", __FUNCTION__);
+ "%s Enter", __func__);
/* Sanity */
if((NULL == hostCtxt) || (NULL == channelEntry))
@@ -3317,7 +3317,7 @@
wpalMutexRelease(&channelEntry->dxeChannelLock);
HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_INFO_LOW,
- "%s Exit", __FUNCTION__);
+ "%s Exit", __func__);
return status;
}
@@ -3354,7 +3354,7 @@
static wpt_uint8 successiveIntWithIMPS;
HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_INFO_LOW,
- "%s Enter", __FUNCTION__);
+ "%s Enter", __func__);
dxeCtxt = (WLANDXE_CtrlBlkType *)(msgContent->pContext);
dxeCtxt->ucTxMsgCnt = 0;
@@ -3582,7 +3582,7 @@
dxePsComplete(dxeCtxt, eWLAN_PAL_TRUE);
HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_INFO_LOW,
- "%s Exit", __FUNCTION__);
+ "%s Exit", __func__);
return;
}
@@ -3612,7 +3612,7 @@
WLANDXE_ChannelCBType *channelCb = NULL;
HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_INFO_LOW,
- "%s Enter", __FUNCTION__);
+ "%s Enter", __func__);
/* Test High Priority Channel is the INT source or not */
channelCb = &dxeCtxt->dxeChannel[WDTS_CHANNEL_TX_HIGH_PRI];
@@ -3633,7 +3633,7 @@
dxeCtxt->txIntEnable = eWLAN_PAL_TRUE;
wpalEnableInterrupt(DXE_INTERRUPT_TX_COMPLE);
HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s %s : %d, %s : %d", __FUNCTION__,
+ "%s %s : %d, %s : %d", __func__,
channelType[dxeCtxt->dxeChannel[WDTS_CHANNEL_TX_HIGH_PRI].channelType],
dxeCtxt->dxeChannel[WDTS_CHANNEL_TX_HIGH_PRI].numRsvdDesc,
channelType[dxeCtxt->dxeChannel[WDTS_CHANNEL_TX_LOW_PRI].channelType],
@@ -3645,7 +3645,7 @@
dxePsComplete(dxeCtxt, eWLAN_PAL_FALSE);
HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_INFO_LOW,
- "%s Exit", __FUNCTION__);
+ "%s Exit", __func__);
return;
}
@@ -3827,7 +3827,7 @@
#endif /* FEATURE_R33D */
HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_INFO_LOW,
- "%s Enter", __FUNCTION__);
+ "%s Enter", __func__);
/* Return from here if the RIVA is in IMPS, to avoid register access */
if(WLANDXE_POWER_STATE_DOWN == dxeCtxt->hostPowerState)
@@ -3844,7 +3844,7 @@
}
dxeCtxt->txIntDisabledByIMPS = eWLAN_PAL_TRUE;
HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_FATAL,
- "%s Riva is in %d, return from here ", __FUNCTION__, dxeCtxt->hostPowerState);
+ "%s Riva is in %d, return from here ", __func__, dxeCtxt->hostPowerState);
return;
}
@@ -3898,7 +3898,7 @@
}
HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_INFO_LOW,
- "%s Exit", __FUNCTION__);
+ "%s Exit", __func__);
return;
}
@@ -3936,7 +3936,7 @@
#endif /* WLANDXE_TEST_CHANNEL_ENABLE */
HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_INFO_LOW,
- "%s Enter", __FUNCTION__);
+ "%s Enter", __func__);
/* This is temporary allocation */
tempDxeCtrlBlk = (WLANDXE_CtrlBlkType *)wpalMemoryAllocate(sizeof(WLANDXE_CtrlBlkType));
@@ -4114,7 +4114,7 @@
HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_WARN,
"WLANDXE_Open Success");
HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_INFO_LOW,
- "%s Exit", __FUNCTION__);
+ "%s Exit", __func__);
return (void *)tempDxeCtrlBlk;
}
@@ -4148,7 +4148,7 @@
WLANDXE_CtrlBlkType *dxeCtxt;
HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_INFO_LOW,
- "%s Enter", __FUNCTION__);
+ "%s Enter", __func__);
/* Sanity */
if(NULL == pDXEContext)
@@ -4195,7 +4195,7 @@
dxeCtxt->clientCtxt = userContext;
HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_INFO_LOW,
- "%s Exit", __FUNCTION__);
+ "%s Exit", __func__);
return status;
}
@@ -4223,7 +4223,7 @@
WLANDXE_CtrlBlkType *dxeCtxt = NULL;
HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_INFO_LOW,
- "%s Enter", __FUNCTION__);
+ "%s Enter", __func__);
/* Sanity */
if(NULL == pDXEContext)
@@ -4319,7 +4319,7 @@
}
HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_INFO_LOW,
- "%s Exit", __FUNCTION__);
+ "%s Exit", __func__);
return status;
}
@@ -4351,7 +4351,7 @@
unsigned int *lowThreshold = NULL;
HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_INFO_LOW,
- "%s Enter", __FUNCTION__);
+ "%s Enter", __func__);
/* Sanity */
if(NULL == pDXEContext)
@@ -4447,7 +4447,7 @@
wpalMutexRelease(¤tChannel->dxeChannelLock);
HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_INFO_LOW,
- "%s Exit", __FUNCTION__);
+ "%s Exit", __func__);
return status;
}
@@ -4574,7 +4574,7 @@
WLANDXE_CtrlBlkType *dxeCtxt = NULL;
HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_INFO_LOW,
- "%s Enter", __FUNCTION__);
+ "%s Enter", __func__);
/* Sanity */
if(NULL == pDXEContext)
@@ -4601,7 +4601,7 @@
wpalUnRegisterInterrupt(DXE_INTERRUPT_RX_READY);
HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_INFO_LOW,
- "%s Exit", __FUNCTION__);
+ "%s Exit", __func__);
return status;
}
@@ -4638,7 +4638,7 @@
#endif /* WLANDXE_TEST_CHANNEL_ENABLE */
HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_INFO_LOW,
- "%s Enter", __FUNCTION__);
+ "%s Enter", __func__);
/* Sanity */
if(NULL == pDXEContext)
@@ -4690,7 +4690,7 @@
wpalMemoryFree(pDXEContext);
HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_INFO_LOW,
- "%s Exit", __FUNCTION__);
+ "%s Exit", __func__);
return status;
}
@@ -4715,12 +4715,12 @@
wpt_status status = eWLAN_PAL_STATUS_SUCCESS;
HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_INFO_LOW,
- "%s Enter", __FUNCTION__);
+ "%s Enter", __func__);
/* TBD */
HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_INFO_LOW,
- "%s Exit", __FUNCTION__);
+ "%s Exit", __func__);
return status;
}
@@ -4750,7 +4750,7 @@
WLANDXE_PowerStateType reqPowerState;
HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_INFO_LOW,
- "%s Enter", __FUNCTION__);
+ "%s Enter", __func__);
dxeCtxt = (WLANDXE_CtrlBlkType *)(msgContent->pContext);
reqPowerState = (WLANDXE_PowerStateType)msgContent->val;
@@ -4806,7 +4806,7 @@
/* Free MSG buffer */
wpalMemoryFree(msgPtr);
HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_INFO_LOW,
- "%s Exit", __FUNCTION__);
+ "%s Exit", __func__);
return;
}
@@ -4834,7 +4834,7 @@
wpt_status status = eWLAN_PAL_STATUS_SUCCESS;
HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_INFO_LOW,
- "%s Enter", __FUNCTION__);
+ "%s Enter", __func__);
/* Now serialise the message through Tx thread also to make sure
* no register access when RIVA is in powersave */
@@ -4850,7 +4850,7 @@
}
HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_INFO_LOW,
- "%s Exit", __FUNCTION__);
+ "%s Exit", __func__);
}
/*==========================================================================
@@ -4881,7 +4881,7 @@
wpt_msg *txDescReSyncMsg;
HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_INFO_LOW,
- "%s Enter", __FUNCTION__);
+ "%s Enter", __func__);
if(NULL == pDXEContext)
{
HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_ERROR,
@@ -4989,7 +4989,7 @@
if(eWLAN_PAL_STATUS_SUCCESS != status)
{
HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_ERROR,
- "%s Enable RX ready interrupt fail", __FUNCTION__);
+ "%s Enable RX ready interrupt fail", __func__);
return status;
}
}
@@ -5002,7 +5002,7 @@
if(eWLAN_PAL_STATUS_SUCCESS != status)
{
HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_ERROR,
- "%s Enable TX comp interrupt fail", __FUNCTION__);
+ "%s Enable TX comp interrupt fail", __func__);
return status;
}
}
@@ -5022,7 +5022,7 @@
}
HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_INFO_LOW,
- "%s Exit", __FUNCTION__);
+ "%s Exit", __func__);
return status;
}
@@ -5046,7 +5046,7 @@
)
{
HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_INFO_LOW,
- "%s Enter", __FUNCTION__);
+ "%s Enter", __func__);
if(NULL == pDXEContext)
{
diff --git a/CORE/DXE/src/wlan_qct_dxe_cfg_i.c b/CORE/DXE/src/wlan_qct_dxe_cfg_i.c
index c08d0ba..70e26e1 100644
--- a/CORE/DXE/src/wlan_qct_dxe_cfg_i.c
+++ b/CORE/DXE/src/wlan_qct_dxe_cfg_i.c
@@ -411,7 +411,7 @@
if((NULL == mappedChannel) || (WDTS_CHANNEL_MAX == idx))
{
HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_ERROR,
- "%s Failed to map channel", __FUNCTION__);
+ "%s Failed to map channel", __func__);
return eWLAN_PAL_STATUS_E_INVAL;
}
diff --git a/CORE/HDD/inc/wlan_hdd_dp_utils.h b/CORE/HDD/inc/wlan_hdd_dp_utils.h
index 83b49d1..aa4451b 100644
--- a/CORE/HDD/inc/wlan_hdd_dp_utils.h
+++ b/CORE/HDD/inc/wlan_hdd_dp_utils.h
@@ -91,7 +91,7 @@
{
if ( pList->count !=0 )
{
- VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "%s: list length not equal to zero",__FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "%s: list length not equal to zero",__func__);
}
}
diff --git a/CORE/HDD/inc/wlan_hdd_main.h b/CORE/HDD/inc/wlan_hdd_main.h
index ffe34fb..96f25d6 100644
--- a/CORE/HDD/inc/wlan_hdd_main.h
+++ b/CORE/HDD/inc/wlan_hdd_main.h
@@ -126,8 +126,8 @@
#endif
#define hddLog(level, args...) VOS_TRACE( VOS_MODULE_ID_HDD, level, ## args)
-#define ENTER() VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, "Enter:%s", __FUNCTION__)
-#define EXIT() VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, "Exit:%s", __FUNCTION__)
+#define ENTER() VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, "Enter:%s", __func__)
+#define EXIT() VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, "Exit:%s", __func__)
#define WLAN_HDD_GET_PRIV_PTR(__dev__) (hdd_adapter_t*)(netdev_priv((__dev__)))
diff --git a/CORE/HDD/src/bap_hdd_main.c b/CORE/HDD/src/bap_hdd_main.c
index 8dff874..7fbddf9 100644
--- a/CORE/HDD/src/bap_hdd_main.c
+++ b/CORE/HDD/src/bap_hdd_main.c
@@ -485,7 +485,7 @@
return VosStatus;
}
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO, "%s: pVosPkt(vos_pkt_t *)=%p\n", __FUNCTION__,
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO, "%s: pVosPkt(vos_pkt_t *)=%p\n", __func__,
pVosPkt );
VosStatus = WLANBAP_XlateTxDataPkt( pctx->bapHdl, pPhyCtx->PhyLinkHdl,
@@ -509,7 +509,7 @@
// provide the meta-info BAP provided previously
*tlMetaInfo = TlMetaInfo;
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s: *vosDataBuff(vos_pkt_t *)=%p\n", __FUNCTION__, *vosDataBuff );
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s: *vosDataBuff(vos_pkt_t *)=%p\n", __func__, *vosDataBuff );
return(VOS_STATUS_SUCCESS);
} // WLANBAP_STAFetchPktCB()
@@ -579,7 +579,7 @@
// both "success" and "empty" are acceptable results
if (!((VosStatus == VOS_STATUS_SUCCESS) || (VosStatus == VOS_STATUS_E_EMPTY)))
{
- VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_FATAL,"%s: Failure walking packet chain", __FUNCTION__);
+ VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_FATAL,"%s: Failure walking packet chain", __func__);
return VOS_STATUS_E_FAILURE;
}
@@ -603,7 +603,7 @@
if(!VOS_IS_STATUS_SUCCESS( VosStatus ))
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR, "%s: Failure extracting skb from vos pkt. "
- "VosStatus = %d\n", __FUNCTION__, VosStatus );
+ "VosStatus = %d\n", __func__, VosStatus );
VosStatus = VOS_STATUS_E_FAILURE;
@@ -685,7 +685,7 @@
if(!VOS_IS_STATUS_SUCCESS( VosStatus ))
{
//This is bad but still try to free the VOSS resources if we can
- VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,"%s: Failure extracting skb from vos pkt", __FUNCTION__);
+ VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,"%s: Failure extracting skb from vos pkt", __func__);
vos_pkt_return_packet( vosDataBuff );
return VOS_STATUS_E_FAILURE;
}
@@ -706,7 +706,7 @@
num_packets = (num_packets + 1) % 4;
if (num_packets == 0 )
{
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO, "%s: Sending up number of completed packets. num_packets = %d.\n", __FUNCTION__, num_packets );
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO, "%s: Sending up number of completed packets. num_packets = %d.\n", __func__, num_packets );
WLANBAP_TxPacketMonitorHandler ( (v_PVOID_t) ppctx->bapHdl ); // our handle in BAP
}
@@ -906,7 +906,7 @@
if(NULL == pctx)
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "pctx is NULL in %s", __FUNCTION__);
+ "pctx is NULL in %s", __func__);
return VOS_STATUS_E_FAULT;
@@ -1473,7 +1473,7 @@
if(!VOS_IS_STATUS_SUCCESS( VosStatus ))
{
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR, "%s: Failure extracting skb from vos pkt. "
- "VosStatus = %d\n", __FUNCTION__, VosStatus );
+ "VosStatus = %d\n", __func__, VosStatus );
// return the packet
VosStatus = vos_pkt_return_packet( pVosPkt );
@@ -1549,7 +1549,7 @@
if ( !VOS_IS_STATUS_SUCCESS( VosStatus ) )
{
- VOS_TRACE(VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH,"%s:BslClientLock already inited",__FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH,"%s:BslClientLock already inited",__func__);
// return(0);
}
@@ -1557,7 +1557,7 @@
{
if ( !BslClientCtx[i].used )
{
- VOS_TRACE(VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH,"%s:BslClientCtx[%d] selected",__FUNCTION__, i);
+ VOS_TRACE(VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH,"%s:BslClientCtx[%d] selected",__func__, i);
BslClientCtx[i].used = TRUE;
break;
}
@@ -1581,7 +1581,7 @@
{
pctx->used = FALSE;
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s:WLAN_GetNewHndl Failed",__FUNCTION__);
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s:WLAN_GetNewHndl Failed",__func__);
return(FALSE);
}
@@ -1596,7 +1596,7 @@
{
pctx->used = FALSE;
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s:WLAN_BAPRegsiterBAPCallaback Failed",__FUNCTION__);
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s:WLAN_BAPRegsiterBAPCallaback Failed",__func__);
return(FALSE);
}
@@ -2296,7 +2296,7 @@
/* Flush the TX queue */
//#ifdef BAP_DEBUG
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR, "%s:HCI Flush command - will flush Tx Queue", __FUNCTION__);
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR, "%s:HCI Flush command - will flush Tx Queue", __func__);
//#endif //BAP_DEBUG
// JEZ100604: Temporary short cut
pPhyCtx = &BslPhyLinkCtx[0];
@@ -2330,7 +2330,7 @@
}
/* Flush the TX queue */
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s:HCI Flush command - will flush Tx Queue for pkt type %d", __FUNCTION__, FlushCmd.packet_type);
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s:HCI Flush command - will flush Tx Queue for pkt type %d", __func__, FlushCmd.packet_type);
// We support BE traffic only
if(WLANTL_AC_BE == FlushCmd.packet_type)
{
@@ -3236,7 +3236,7 @@
// unpack
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "BslProcessHCICommand: HCI_Write_Remote_AMP_ASSOC_Cmd Count = %d", Count);
- DUMPLOG(1, __FUNCTION__, "HCI_Write_Remote_AMP_ASSOC cmd",
+ DUMPLOG(1, __func__, "HCI_Write_Remote_AMP_ASSOC cmd",
pBuf,
Count);
@@ -4031,7 +4031,7 @@
BslPhyLinkCtxType* pPhyCtx;
//VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "BSL_Flush - will flush ALL Tx Queues");
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR, "%s - will flush ALL Tx Queues", __FUNCTION__);
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR, "%s - will flush ALL Tx Queues", __func__);
/* Flush the TX queue */
// JEZ100604: Temporary short cut
@@ -4083,22 +4083,22 @@
//char *bslBuff = NULL;
BslHciWorkStructure *pHciContext;
- //VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s", __FUNCTION__);
+ //VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s", __func__);
// Sanity check inputs
if ( skb == NULL )
{
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s: skb is bad i/p", __FUNCTION__);
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s: skb is bad i/p", __func__);
//return -EFAULT; /* Bad address */
return 0;
}
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s: Count (skb->len)=%d", __FUNCTION__, skb->len);
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s: Count (skb->len)=%d", __func__, skb->len);
// Sanity check inputs
if ( 0 == skb->len )
{
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s: skb is empty", __FUNCTION__);
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s: skb is empty", __func__);
//return -EFAULT; /* Bad address */
return 0;
}
@@ -4108,7 +4108,7 @@
// Sanity check the HCI device in the skb
if ( hdev == NULL )
{
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s: Frame for Unknown HCI device (hdev=NULL)", __FUNCTION__);
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s: Frame for Unknown HCI device (hdev=NULL)", __func__);
//return -ENODEV; /* no device */
return 0;
}
@@ -4118,7 +4118,7 @@
// Sanity check inputs
if ( pctx == NULL )
{
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s: pctx is bad i/p", __FUNCTION__);
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s: pctx is bad i/p", __func__);
//return -EFAULT; /* Bad address */
return 0;
/* Maybe I should return "no device" */
@@ -4132,7 +4132,7 @@
// Directly execute the data write
VOS_TRACE(VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: HCI ACL data tx, skb=%p",
- __FUNCTION__, skb);
+ __func__, skb);
// ACL data
hdev->stat.acl_tx++;
// Correct way of doing this...
@@ -4147,7 +4147,7 @@
break;
case HCI_COMMAND_PKT:
// Defer the HCI command writes
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s: HCI command", __FUNCTION__);
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s: HCI command", __func__);
hdev->stat.cmd_tx++;
// Allocate an HCI context. To use as a "container" for the "work" to be deferred.
@@ -4156,7 +4156,7 @@
{
// no memory for HCI context. Nothing we can do but drop
VOS_TRACE(VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
- "%s: Unable to allocate context", __FUNCTION__);
+ "%s: Unable to allocate context", __func__);
kfree_skb(skb);
return 0;
}
@@ -4172,14 +4172,14 @@
VOS_TRACE(VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: Scheduling work for skb %p, BT-AMP Client context %p, work %p",
- __FUNCTION__, skb, pctx, pHciContext);
+ __func__, skb, pctx, pHciContext);
status = schedule_work(&pHciContext->hciInterfaceProcessing);
// Check result
if ( 0 == status )
{
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR, "%s: hciInterfaceProcessing work already queued. This should never happen.", __FUNCTION__);
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR, "%s: hciInterfaceProcessing work already queued. This should never happen.", __func__);
}
@@ -4188,7 +4188,7 @@
written = skb->len;
break;
case HCI_SCODATA_PKT:
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s: unknown type", __FUNCTION__);
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s: unknown type", __func__);
hdev->stat.sco_tx++;
// anything else including HCI events and SCO data
status = FALSE;
@@ -4236,12 +4236,12 @@
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_LOW,
"%s: Entered, context %p",
- __FUNCTION__, pctx);
+ __func__, pctx);
// Sanity check inputs
if ( pctx == NULL )
{
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s: pctx is bad i/p", __FUNCTION__);
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s: pctx is bad i/p", __func__);
return; // -EFAULT; /* Bad address */
}
@@ -4252,18 +4252,18 @@
// Sanity check inputs
if ( skb == NULL )
{
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s: skb is bad i/p", __FUNCTION__);
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s: skb is bad i/p", __func__);
return; // -EFAULT; /* Bad address */
}
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s: Count (skb->len)=%d", __FUNCTION__, skb->len);
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s: Count (skb->len)=%d", __func__, skb->len);
hdev = (struct hci_dev *)(skb->dev);
// Sanity check the HCI device in the skb
if ( hdev == NULL )
{
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s: Frame for Unknown HCI device (hdev=NULL)", __FUNCTION__);
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s: Frame for Unknown HCI device (hdev=NULL)", __func__);
return; // -ENODEV; /* no device */
}
@@ -4271,7 +4271,7 @@
// Sanity check inputs
if ( pctx != (BslClientCtxType *)hci_get_drvdata(hdev));
{
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s: pctx and hdev not consistent - bad i/p", __FUNCTION__);
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s: pctx and hdev not consistent - bad i/p", __func__);
return; // -EFAULT; /* Bad address */
/* Maybe I should return "no device" */
//return -ENODEV; /* no device */
@@ -4281,7 +4281,7 @@
switch (bt_cb(skb)->pkt_type)
{
case HCI_COMMAND_PKT:
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s: HCI command", __FUNCTION__);
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s: HCI command", __func__);
hdev->stat.cmd_tx++;
// HCI command
status = BslProcessHCICommand( pctx, skb->data, skb->len-CMD_TLV_TYPE_AND_LEN_SIZE);
@@ -4290,7 +4290,7 @@
written = skb->len;
break;
case HCI_SCODATA_PKT:
- VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s: unknown type", __FUNCTION__);
+ VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s: unknown type", __func__);
hdev->stat.sco_tx++;
// anything else including HCI events and SCO data
status = FALSE;
@@ -4303,7 +4303,7 @@
VOS_TRACE(VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: Freeing skb %p",
- __FUNCTION__, skb);
+ __func__, skb);
consume_skb(skb);
diff --git a/CORE/HDD/src/wlan_hdd_assoc.c b/CORE/HDD/src/wlan_hdd_assoc.c
index e33e643..d21175a 100644
--- a/CORE/HDD/src/wlan_hdd_assoc.c
+++ b/CORE/HDD/src/wlan_hdd_assoc.c
@@ -645,7 +645,7 @@
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_WARN,
"%s: WLANTL_ClearSTAClient() failed to for staID %d. "
"Status= %d [0x%08lX]",
- __FUNCTION__, staId, vosStatus, vosStatus );
+ __func__, staId, vosStatus, vosStatus );
}
return( vosStatus );
}
@@ -864,7 +864,7 @@
#endif
#ifdef FEATURE_WLAN_WAPI
- hddLog(LOG1, "%s: WAPI STA Registered: %d", __FUNCTION__, pAdapter->wapi_info.fIsWapiSta);
+ hddLog(LOG1, "%s: WAPI STA Registered: %d", __func__, pAdapter->wapi_info.fIsWapiSta);
if (pAdapter->wapi_info.fIsWapiSta)
{
staDesc.ucIsWapiSta = 1;
@@ -2025,9 +2025,9 @@
&dot11RSNIE);
// Copy out the encryption and authentication types
hddLog(LOG1, FL("%s: pairwise cipher suite count: %d"),
- __FUNCTION__, dot11RSNIE.pwise_cipher_suite_count );
+ __func__, dot11RSNIE.pwise_cipher_suite_count );
hddLog(LOG1, FL("%s: authentication suite count: %d"),
- __FUNCTION__, dot11RSNIE.akm_suite_count);
+ __func__, dot11RSNIE.akm_suite_count);
/*Here we have followed the apple base code,
but probably I suspect we can do something different*/
//dot11RSNIE.akm_suite_count
@@ -2057,7 +2057,7 @@
}
// Calling csrRoamSetPMKIDCache to configure the PMKIDs into the cache
hddLog(LOG1, FL("%s: Calling csrRoamSetPMKIDCache with cache entry %ld."),
- __FUNCTION__, i );
+ __func__, i );
// Finally set the PMKSA ID Cache in CSR
result = sme_RoamSetPMKIDCache(halHandle,pAdapter->sessionId,
PMKIDCache,
@@ -2081,9 +2081,9 @@
&dot11WPAIE);
// Copy out the encryption and authentication types
hddLog(LOG1, FL("%s: WPA unicast cipher suite count: %d"),
- __FUNCTION__, dot11WPAIE.unicast_cipher_count );
+ __func__, dot11WPAIE.unicast_cipher_count );
hddLog(LOG1, FL("%s: WPA authentication suite count: %d"),
- __FUNCTION__, dot11WPAIE.auth_suite_count);
+ __func__, dot11WPAIE.auth_suite_count);
//dot11WPAIE.auth_suite_count
// Just translate the FIRST one
*pAuthType = hdd_TranslateWPAToCsrAuthType(dot11WPAIE.auth_suites[0]);
@@ -2136,7 +2136,7 @@
pWextState->roamProfile.EncryptionType.encryptionType[0] = RSNEncryptType; // Use the cipher type in the RSN IE
pWextState->roamProfile.mcEncryptionType.encryptionType[0] = mcRSNEncryptType;
- hddLog( LOG1, "%s: CSR AuthType = %d, EncryptionType = %d mcEncryptionType = %d", __FUNCTION__, *RSNAuthType, RSNEncryptType, mcRSNEncryptType);
+ hddLog( LOG1, "%s: CSR AuthType = %d, EncryptionType = %d mcEncryptionType = %d", __func__, *RSNAuthType, RSNEncryptType, mcRSNEncryptType);
}
return 0;
}
@@ -2148,7 +2148,7 @@
ENTER();
pRoamProfile->AuthType.numEntries = 1;
- hddLog( LOG1, "%s: pHddStaCtx->conn_info.authType = %d\n", __FUNCTION__, pHddStaCtx->conn_info.authType);
+ hddLog( LOG1, "%s: pHddStaCtx->conn_info.authType = %d\n", __func__, pHddStaCtx->conn_info.authType);
switch( pHddStaCtx->conn_info.authType)
{
@@ -2167,11 +2167,11 @@
if ((RSNAuthType == eCSR_AUTH_TYPE_CCKM_WPA) &&
((pWextState->authKeyMgmt & IW_AUTH_KEY_MGMT_802_1X)
== IW_AUTH_KEY_MGMT_802_1X)) {
- hddLog( LOG1, "%s: set authType to CCKM WPA. AKM also 802.1X.\n", __FUNCTION__);
+ hddLog( LOG1, "%s: set authType to CCKM WPA. AKM also 802.1X.\n", __func__);
pRoamProfile->AuthType.authType[0] = eCSR_AUTH_TYPE_CCKM_WPA;
} else
if ((RSNAuthType == eCSR_AUTH_TYPE_CCKM_WPA)) {
- hddLog( LOG1, "%s: Last chance to set authType to CCKM WPA.\n", __FUNCTION__);
+ hddLog( LOG1, "%s: Last chance to set authType to CCKM WPA.\n", __func__);
pRoamProfile->AuthType.authType[0] = eCSR_AUTH_TYPE_CCKM_WPA;
} else
#endif
@@ -2191,11 +2191,11 @@
if ((RSNAuthType == eCSR_AUTH_TYPE_CCKM_RSN) &&
((pWextState->authKeyMgmt & IW_AUTH_KEY_MGMT_802_1X)
== IW_AUTH_KEY_MGMT_802_1X)) {
- hddLog( LOG1, "%s: set authType to CCKM RSN. AKM also 802.1X.\n", __FUNCTION__);
+ hddLog( LOG1, "%s: set authType to CCKM RSN. AKM also 802.1X.\n", __func__);
pRoamProfile->AuthType.authType[0] = eCSR_AUTH_TYPE_CCKM_RSN;
} else
if ((RSNAuthType == eCSR_AUTH_TYPE_CCKM_RSN)) {
- hddLog( LOG1, "%s: Last chance to set authType to CCKM RSN.\n", __FUNCTION__);
+ hddLog( LOG1, "%s: Last chance to set authType to CCKM RSN.\n", __func__);
pRoamProfile->AuthType.authType[0] = eCSR_AUTH_TYPE_CCKM_RSN;
} else
#endif
@@ -2233,14 +2233,14 @@
default:
#ifdef FEATURE_WLAN_CCX
- hddLog( LOG1, "%s: In default, unknown auth type.\n", __FUNCTION__);
+ hddLog( LOG1, "%s: In default, unknown auth type.\n", __func__);
#endif /* FEATURE_WLAN_CCX */
pRoamProfile->AuthType.authType[0] = eCSR_AUTH_TYPE_UNKNOWN;
break;
}
hddLog( LOG1, "%s Set roam Authtype to %d",
- __FUNCTION__, pWextState->roamProfile.AuthType.authType[0]);
+ __func__, pWextState->roamProfile.AuthType.authType[0]);
EXIT();
return 0;
@@ -2345,21 +2345,21 @@
hdd_set_csr_auth_type(pAdapter, RSNAuthType);
}
#ifdef FEATURE_WLAN_WAPI
- hddLog(LOG1, "%s: Setting WAPI AUTH Type and Encryption Mode values", __FUNCTION__);
+ hddLog(LOG1, "%s: Setting WAPI AUTH Type and Encryption Mode values", __func__);
if (pAdapter->wapi_info.nWapiMode)
{
switch (pAdapter->wapi_info.wapiAuthMode)
{
case WAPI_AUTH_MODE_PSK:
{
- hddLog(LOG1, "%s: WAPI AUTH TYPE: PSK: %d", __FUNCTION__, pAdapter->wapi_info.wapiAuthMode);
+ hddLog(LOG1, "%s: WAPI AUTH TYPE: PSK: %d", __func__, pAdapter->wapi_info.wapiAuthMode);
pRoamProfile->AuthType.numEntries = 1;
pRoamProfile->AuthType.authType[0] = eCSR_AUTH_TYPE_WAPI_WAI_PSK;
break;
}
case WAPI_AUTH_MODE_CERT:
{
- hddLog(LOG1, "%s: WAPI AUTH TYPE: CERT: %d", __FUNCTION__, pAdapter->wapi_info.wapiAuthMode);
+ hddLog(LOG1, "%s: WAPI AUTH TYPE: CERT: %d", __func__, pAdapter->wapi_info.wapiAuthMode);
pRoamProfile->AuthType.numEntries = 1;
pRoamProfile->AuthType.authType[0] = eCSR_AUTH_TYPE_WAPI_WAI_CERTIFICATE;
break;
@@ -2368,7 +2368,7 @@
if ( pAdapter->wapi_info.wapiAuthMode == WAPI_AUTH_MODE_PSK ||
pAdapter->wapi_info.wapiAuthMode == WAPI_AUTH_MODE_CERT)
{
- hddLog(LOG1, "%s: WAPI PAIRWISE/GROUP ENCRYPTION: WPI", __FUNCTION__);
+ hddLog(LOG1, "%s: WAPI PAIRWISE/GROUP ENCRYPTION: WPI", __func__);
pRoamProfile->EncryptionType.numEntries = 1;
pRoamProfile->EncryptionType.encryptionType[0] = eCSR_ENCRYPT_TYPE_WPI;
pRoamProfile->mcEncryptionType.numEntries = 1;
@@ -2517,7 +2517,7 @@
else {
hddLog(LOGW, "%s value %d UNKNOWN IW_AUTH_CIPHER",
- __FUNCTION__, wrqu->param.value);
+ __func__, wrqu->param.value);
return -EINVAL;
}
@@ -2568,7 +2568,7 @@
else {
hddLog(LOGW, "%s value %d UNKNOWN IW_AUTH_CIPHER",
- __FUNCTION__, wrqu->param.value);
+ __func__, wrqu->param.value);
return -EINVAL;
}
@@ -2600,8 +2600,8 @@
#define IW_AUTH_KEY_MGMT_CCKM 8 /* Should be in linux/wireless.h */
/*Check for CCKM AKM type */
if ( wrqu->param.value & IW_AUTH_KEY_MGMT_CCKM) {
- //hddLog(VOS_TRACE_LEVEL_INFO_HIGH,"%s: CCKM AKM Set %d\n", __FUNCTION__, wrqu->param.value);
- hddLog(VOS_TRACE_LEVEL_INFO,"%s: CCKM AKM Set %d\n", __FUNCTION__, wrqu->param.value);
+ //hddLog(VOS_TRACE_LEVEL_INFO_HIGH,"%s: CCKM AKM Set %d\n", __func__, wrqu->param.value);
+ hddLog(VOS_TRACE_LEVEL_INFO,"%s: CCKM AKM Set %d\n", __func__, wrqu->param.value);
/* Set the CCKM bit in authKeyMgmt */
/* Right now, this breaks all ref to authKeyMgmt because our
* code doesn't realize it is a "bitfield"
@@ -2658,7 +2658,7 @@
default:
- hddLog(LOGW, "%s called with unsupported auth type %d", __FUNCTION__,
+ hddLog(LOGW, "%s called with unsupported auth type %d", __func__,
wrqu->param.flags & IW_AUTH_INDEX);
break;
}
@@ -2709,25 +2709,25 @@
wrqu->param.value = IW_AUTH_ALG_SHARED_KEY;
break;
case eCSR_AUTH_TYPE_UNKNOWN:
- hddLog(LOG1,"%s called with unknown auth type", __FUNCTION__);
+ hddLog(LOG1,"%s called with unknown auth type", __func__);
wrqu->param.value = IW_AUTH_ALG_OPEN_SYSTEM;
break;
case eCSR_AUTH_TYPE_AUTOSWITCH:
wrqu->param.value = IW_AUTH_ALG_OPEN_SYSTEM;
break;
case eCSR_AUTH_TYPE_WPA_PSK:
- hddLog(LOG1,"%s called with unknown auth type", __FUNCTION__);
+ hddLog(LOG1,"%s called with unknown auth type", __func__);
wrqu->param.value = IW_AUTH_ALG_OPEN_SYSTEM;
return -EIO;
#ifdef WLAN_FEATURE_VOWIFI_11R
case eCSR_AUTH_TYPE_FT_RSN_PSK:
#endif
case eCSR_AUTH_TYPE_RSN_PSK:
- hddLog(LOG1,"%s called with unknown auth type", __FUNCTION__);
+ hddLog(LOG1,"%s called with unknown auth type", __func__);
wrqu->param.value = IW_AUTH_ALG_OPEN_SYSTEM;
return -EIO;
default:
- hddLog(LOG1,"%s called with unknown auth type", __FUNCTION__);
+ hddLog(LOG1,"%s called with unknown auth type", __func__);
wrqu->param.value = IW_AUTH_ALG_OPEN_SYSTEM;
return -EIO;
}
@@ -2753,7 +2753,7 @@
wrqu->param.value = IW_AUTH_CIPHER_CCMP;
break;
default:
- hddLog(LOG1, "%s called with unknown auth type", __FUNCTION__);
+ hddLog(LOG1, "%s called with unknown auth type", __func__);
return -EIO;
}
}
@@ -2780,13 +2780,13 @@
wrqu->param.value = IW_AUTH_CIPHER_CCMP;
break;
default:
- hddLog(LOG1, "%s called with unknown auth type", __FUNCTION__);
+ hddLog(LOG1, "%s called with unknown auth type", __func__);
return -EIO;
}
}
hddLog(LOG1, "%s called with auth type %d",
- __FUNCTION__, pRoamProfile->AuthType.authType[0]);
+ __func__, pRoamProfile->AuthType.authType[0]);
EXIT();
return 0;
}
diff --git a/CORE/HDD/src/wlan_hdd_cfg.c b/CORE/HDD/src/wlan_hdd_cfg.c
index b8c8d17..96f16d7 100644
--- a/CORE/HDD/src/wlan_hdd_cfg.c
+++ b/CORE/HDD/src/wlan_hdd_cfg.c
@@ -1787,22 +1787,22 @@
if(status)
{
- hddLog(VOS_TRACE_LEVEL_FATAL, "%s: request_firmware failed %d\n",__FUNCTION__, status);
+ hddLog(VOS_TRACE_LEVEL_FATAL, "%s: request_firmware failed %d\n",__func__, status);
return VOS_STATUS_E_FAILURE;
}
if(!fw || !fw->data || !fw->size)
{
hddLog(VOS_TRACE_LEVEL_FATAL, "%s: %s download failed\n",
- __FUNCTION__, WLAN_INI_FILE);
+ __func__, WLAN_INI_FILE);
return VOS_STATUS_E_FAILURE;
}
- hddLog(LOG1, "%s: qcom_cfg.ini Size %d\n",__FUNCTION__, fw->size);
+ hddLog(LOG1, "%s: qcom_cfg.ini Size %d\n",__func__, fw->size);
buffer = (char*)vos_mem_malloc(fw->size);
if(NULL == buffer) {
- hddLog(VOS_TRACE_LEVEL_FATAL, "%s: kmalloc failure",__FUNCTION__);
+ hddLog(VOS_TRACE_LEVEL_FATAL, "%s: kmalloc failure",__func__);
release_firmware(fw);
return VOS_STATUS_E_FAILURE;
}
@@ -1844,7 +1844,7 @@
cfgIniTable[i++].value= value;
if(i >= MAX_CFG_INI_ITEMS) {
hddLog(LOGE,"%s: Number of items in %s > %d \n",
- __FUNCTION__, WLAN_INI_FILE, MAX_CFG_INI_ITEMS);
+ __func__, WLAN_INI_FILE, MAX_CFG_INI_ITEMS);
break;
}
}
@@ -2196,7 +2196,7 @@
if (MAX_CFG_INI_ITEMS < cRegTableEntries)
{
hddLog(LOGE, "%s: MAX_CFG_INI_ITEMS too small, must be at least %d",
- __FUNCTION__, cRegTableEntries);
+ __func__, cRegTableEntries);
}
for ( idx = 0; idx < cRegTableEntries; idx++, pRegEntry++ )
@@ -2210,7 +2210,7 @@
{
// If we could not read the cfg item and it is required, this is an error.
hddLog(LOGE, "%s: Failed to read required config parameter %s",
- __FUNCTION__, pRegEntry->RegName);
+ __func__, pRegEntry->RegName);
ret_status = VOS_STATUS_E_FAILURE;
break;
}
@@ -2236,14 +2236,14 @@
if ( value > pRegEntry->VarMax )
{
hddLog(LOGE, "%s: Reg Parameter %s > allowed Maximum [%lu > %lu]. Enforcing Maximum",
- __FUNCTION__, pRegEntry->RegName, value, pRegEntry->VarMax );
+ __func__, pRegEntry->RegName, value, pRegEntry->VarMax );
value = pRegEntry->VarMax;
}
if ( value < pRegEntry->VarMin )
{
hddLog(LOGE, "%s: Reg Parameter %s < allowed Minimum [%lu < %lu]. Enforcing Minimum",
- __FUNCTION__, pRegEntry->RegName, value, pRegEntry->VarMin);
+ __func__, pRegEntry->RegName, value, pRegEntry->VarMin);
value = pRegEntry->VarMin;
}
}
@@ -2253,14 +2253,14 @@
if ( value > pRegEntry->VarMax )
{
hddLog(LOGE, "%s: Reg Parameter %s > allowed Maximum [%lu > %lu]. Enforcing Default= %lu",
- __FUNCTION__, pRegEntry->RegName, value, pRegEntry->VarMax, pRegEntry->VarDefault );
+ __func__, pRegEntry->RegName, value, pRegEntry->VarMax, pRegEntry->VarDefault );
value = pRegEntry->VarDefault;
}
if ( value < pRegEntry->VarMin )
{
hddLog(LOGE, "%s: Reg Parameter %s < allowed Minimum [%lu < %lu]. Enforcing Default= %lu",
- __FUNCTION__, pRegEntry->RegName, value, pRegEntry->VarMin, pRegEntry->VarDefault );
+ __func__, pRegEntry->RegName, value, pRegEntry->VarMin, pRegEntry->VarDefault );
value = pRegEntry->VarDefault;
}
}
@@ -2287,7 +2287,7 @@
if ( svalue > (v_S31_t)pRegEntry->VarMax )
{
hddLog(LOGE, "%s: Reg Parameter %s > allowed Maximum "
- "[%ld > %ld]. Enforcing Maximum", __FUNCTION__,
+ "[%ld > %ld]. Enforcing Maximum", __func__,
pRegEntry->RegName, svalue, (int)pRegEntry->VarMax );
svalue = (v_S31_t)pRegEntry->VarMax;
}
@@ -2295,7 +2295,7 @@
if ( svalue < (v_S31_t)pRegEntry->VarMin )
{
hddLog(LOGE, "%s: Reg Parameter %s < allowed Minimum "
- "[%ld < %ld]. Enforcing Minimum", __FUNCTION__,
+ "[%ld < %ld]. Enforcing Minimum", __func__,
pRegEntry->RegName, svalue, (int)pRegEntry->VarMin);
svalue = (v_S31_t)pRegEntry->VarMin;
}
@@ -2307,7 +2307,7 @@
{
hddLog(LOGE, "%s: Reg Parameter %s > allowed Maximum "
"[%ld > %ld]. Enforcing Default= %ld",
- __FUNCTION__, pRegEntry->RegName, svalue,
+ __func__, pRegEntry->RegName, svalue,
(int)pRegEntry->VarMax,
(int)pRegEntry->VarDefault );
svalue = (v_S31_t)pRegEntry->VarDefault;
@@ -2317,7 +2317,7 @@
{
hddLog(LOGE, "%s: Reg Parameter %s < allowed Minimum "
"[%ld < %ld]. Enforcing Default= %ld",
- __FUNCTION__, pRegEntry->RegName, svalue,
+ __func__, pRegEntry->RegName, svalue,
(int)pRegEntry->VarMin,
(int)pRegEntry->VarDefault);
svalue = pRegEntry->VarDefault;
@@ -2341,7 +2341,7 @@
if(len_value_str > (pRegEntry->VarSize - 1)) {
hddLog(LOGE, "%s: Invalid Value=[%s] specified for Name=[%s] in %s\n",
- __FUNCTION__, value_str, pRegEntry->RegName, WLAN_INI_FILE);
+ __func__, value_str, pRegEntry->RegName, WLAN_INI_FILE);
cbOutString = utilMin( strlen( (char *)pRegEntry->VarDefault ), pRegEntry->VarSize - 1 );
memcpy( pField, (void *)(pRegEntry->VarDefault), cbOutString );
( (v_U8_t *)pField )[ cbOutString ] = '\0';
@@ -2364,7 +2364,7 @@
{
if(pRegEntry->VarSize != VOS_MAC_ADDR_SIZE) {
hddLog(LOGE, "%s: Invalid VarSize %u for Name=[%s]\n",
- __FUNCTION__, pRegEntry->VarSize, pRegEntry->RegName);
+ __func__, pRegEntry->VarSize, pRegEntry->RegName);
continue;
}
candidate = (char*)pRegEntry->VarDefault;
@@ -2372,7 +2372,7 @@
len_value_str = strlen(value_str);
if(len_value_str != (VOS_MAC_ADDR_SIZE*2)) {
hddLog(LOGE, "%s: Invalid MAC addr [%s] specified for Name=[%s] in %s\n",
- __FUNCTION__, value_str, pRegEntry->RegName, WLAN_INI_FILE);
+ __func__, value_str, pRegEntry->RegName, WLAN_INI_FILE);
}
else
candidate = value_str;
@@ -2387,7 +2387,7 @@
else
{
hddLog(LOGE, "%s: Unknown param type for name[%s] in registry table\n",
- __FUNCTION__, pRegEntry->RegName);
+ __func__, pRegEntry->RegName);
}
// did we successfully parse a cfg item for this parameter?
@@ -3242,7 +3242,7 @@
if (NULL == clone)
{
hddLog(LOGE, "%s: memory allocation failure, unable to process [%s]",
- __FUNCTION__, command);
+ __func__, command);
return vstatus;
}
@@ -3256,7 +3256,7 @@
{
// only whitespace
hddLog(LOGE, "%s: invalid command, only whitespace:[%s]",
- __FUNCTION__, command);
+ __func__, command);
goto done;
}
@@ -3270,7 +3270,7 @@
{
// did not find '='
hddLog(LOGE, "%s: invalid command, no '=':[%s]",
- __FUNCTION__, command);
+ __func__, command);
goto done;
}
@@ -3281,7 +3281,7 @@
{
// did not find a name
hddLog(LOGE, "%s: invalid command, no <name>:[%s]",
- __FUNCTION__, command);
+ __func__, command);
goto done;
}
@@ -3290,7 +3290,7 @@
{
// did not find a value
hddLog(LOGE, "%s: invalid command, no <value>:[%s]",
- __FUNCTION__, command);
+ __func__, command);
goto done;
}
@@ -3307,7 +3307,7 @@
{
// did not match the name
hddLog(LOGE, "%s: invalid command, unknown configuration item:[%s]",
- __FUNCTION__, command);
+ __func__, command);
goto done;
}
@@ -3316,7 +3316,7 @@
{
// does not support dynamic configuration
hddLog(LOGE, "%s: invalid command, %s does not support "
- "dynamic configuration", __FUNCTION__, name);
+ "dynamic configuration", __func__, name);
goto done;
}
@@ -3330,14 +3330,14 @@
{
// out of range
hddLog(LOGE, "%s: invalid command, value %u < min value %u",
- __FUNCTION__, value, pRegEntry->VarMin);
+ __func__, value, pRegEntry->VarMin);
goto done;
}
if (value > pRegEntry->VarMax)
{
// out of range
hddLog(LOGE, "%s: invalid command, value %u > max value %u",
- __FUNCTION__, value, pRegEntry->VarMax);
+ __func__, value, pRegEntry->VarMax);
goto done;
}
memcpy(pField, &value, pRegEntry->VarSize);
@@ -3349,14 +3349,14 @@
{
// out of range
hddLog(LOGE, "%s: invalid command, value %x < min value %x",
- __FUNCTION__, value, pRegEntry->VarMin);
+ __func__, value, pRegEntry->VarMin);
goto done;
}
if (value > pRegEntry->VarMax)
{
// out of range
hddLog(LOGE, "%s: invalid command, value %x > max value %x",
- __FUNCTION__, value, pRegEntry->VarMax);
+ __func__, value, pRegEntry->VarMax);
goto done;
}
memcpy(pField, &value, pRegEntry->VarSize);
@@ -3368,14 +3368,14 @@
{
// out of range
hddLog(LOGE, "%s: invalid command, value %d < min value %d",
- __FUNCTION__, svalue, (int)pRegEntry->VarMin);
+ __func__, svalue, (int)pRegEntry->VarMin);
goto done;
}
if (svalue > (v_S31_t)pRegEntry->VarMax)
{
// out of range
hddLog(LOGE, "%s: invalid command, value %d > max value %d",
- __FUNCTION__, svalue, (int)pRegEntry->VarMax);
+ __func__, svalue, (int)pRegEntry->VarMax);
goto done;
}
memcpy(pField, &svalue, pRegEntry->VarSize);
@@ -3389,7 +3389,7 @@
hddLog(LOGE,
"%s: invalid command, string [%s] length "
"%u exceeds maximum length %u",
- __FUNCTION__, value_str,
+ __func__, value_str,
len_value_str, (pRegEntry->VarSize - 1));
goto done;
}
@@ -3405,7 +3405,7 @@
hddLog(LOGE,
"%s: invalid command, MAC address [%s] length "
"%u is not expected length %u",
- __FUNCTION__, value_str,
+ __func__, value_str,
len_value_str, (VOS_MAC_ADDR_SIZE * 2));
goto done;
}
diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c
index 25d8b4a..a238c00 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -1735,7 +1735,7 @@
if (NULL == pAdapter)
{
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_FATAL,
- "%s: HDD adapter context is Null", __FUNCTION__);
+ "%s: HDD adapter context is Null", __func__);
return -ENODEV;
}
if ((WLAN_HDD_GET_CTX(pAdapter))->isLogpInProgress)
@@ -1749,7 +1749,7 @@
if (NULL == pHddCtx)
{
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_FATAL,
- "%s: HDD context is Null", __FUNCTION__);
+ "%s: HDD context is Null", __func__);
return -ENODEV;
}
@@ -1760,7 +1760,7 @@
if (NULL == staAdapter)
{
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_FATAL,
- "%s: HDD adapter context is Null", __FUNCTION__);
+ "%s: HDD adapter context is Null", __func__);
return -ENODEV;
}
}
@@ -1789,7 +1789,7 @@
{
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_FATAL,
"%s: Timeout occured while waiting for abortscan" ,
- __FUNCTION__);
+ __func__);
VOS_ASSERT(pScanInfo->mScanPending);
return 0;
}
@@ -2339,7 +2339,7 @@
WLANTL_STA_AUTHENTICATED);
VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_ERROR,
- "%s: Station MAC address does not matching", __FUNCTION__);
+ "%s: Station MAC address does not matching", __func__);
return -EINVAL;
}
}
@@ -4120,19 +4120,19 @@
#ifdef FEATURE_WLAN_WAPI
if (pAdapter->wapi_info.nWapiMode)
{
- hddLog(LOG1, "%s: Setting WAPI AUTH Type and Encryption Mode values", __FUNCTION__);
+ hddLog(LOG1, "%s: Setting WAPI AUTH Type and Encryption Mode values", __func__);
switch (pAdapter->wapi_info.wapiAuthMode)
{
case WAPI_AUTH_MODE_PSK:
{
- hddLog(LOG1, "%s: WAPI AUTH TYPE: PSK: %d", __FUNCTION__,
+ hddLog(LOG1, "%s: WAPI AUTH TYPE: PSK: %d", __func__,
pAdapter->wapi_info.wapiAuthMode);
pRoamProfile->AuthType.authType[0] = eCSR_AUTH_TYPE_WAPI_WAI_PSK;
break;
}
case WAPI_AUTH_MODE_CERT:
{
- hddLog(LOG1, "%s: WAPI AUTH TYPE: CERT: %d", __FUNCTION__,
+ hddLog(LOG1, "%s: WAPI AUTH TYPE: CERT: %d", __func__,
pAdapter->wapi_info.wapiAuthMode);
pRoamProfile->AuthType.authType[0] = eCSR_AUTH_TYPE_WAPI_WAI_CERTIFICATE;
break;
@@ -4141,7 +4141,7 @@
if ( pAdapter->wapi_info.wapiAuthMode == WAPI_AUTH_MODE_PSK ||
pAdapter->wapi_info.wapiAuthMode == WAPI_AUTH_MODE_CERT)
{
- hddLog(LOG1, "%s: WAPI PAIRWISE/GROUP ENCRYPTION: WPI", __FUNCTION__);
+ hddLog(LOG1, "%s: WAPI PAIRWISE/GROUP ENCRYPTION: WPI", __func__);
pRoamProfile->AuthType.numEntries = 1;
pRoamProfile->EncryptionType.numEntries = 1;
pRoamProfile->EncryptionType.encryptionType[0] = eCSR_ENCRYPT_TYPE_WPI;
@@ -4562,13 +4562,13 @@
if (WAPI_PSK_AKM_SUITE == akmsuite[0])
{
hddLog(VOS_TRACE_LEVEL_INFO, "%s: WAPI AUTH MODE SET TO PSK",
- __FUNCTION__);
+ __func__);
pAdapter->wapi_info.wapiAuthMode = WAPI_AUTH_MODE_PSK;
}
if (WAPI_CERT_AKM_SUITE == akmsuite[0])
{
hddLog(VOS_TRACE_LEVEL_INFO, "%s: WAPI AUTH MODE SET TO CERTIFICATE",
- __FUNCTION__);
+ __func__);
pAdapter->wapi_info.wapiAuthMode = WAPI_AUTH_MODE_CERT;
}
break;
@@ -5859,7 +5859,7 @@
pmksa->pmkid,
CSR_RSN_PMKID_SIZE);
hddLog(VOS_TRACE_LEVEL_FATAL, "%s: Reusing cache entry %d.",
- __FUNCTION__, j );
+ __func__, j );
dump_bssid(pmksa->bssid);
dump_pmkid(halHandle, pmksa->pmkid);
break;
@@ -5878,7 +5878,7 @@
pmksa->pmkid,
CSR_RSN_PMKID_SIZE);
hddLog(VOS_TRACE_LEVEL_FATAL, "%s: Adding a new cache entry %d.",
- __FUNCTION__, i );
+ __func__, i );
dump_bssid(pmksa->bssid);
dump_pmkid(halHandle, pmksa->pmkid);
// Increment the HDD Local Cache index
@@ -5889,9 +5889,9 @@
// Calling csrRoamSetPMKIDCache to configure the PMKIDs into the cache
//hddLog(LOG1, FL("%s: Calling csrRoamSetPMKIDCache with %d cache entries."),
- // __FUNCTION__, i );
+ // __func__, i );
hddLog(VOS_TRACE_LEVEL_FATAL, "%s: Calling csrRoamSetPMKIDCache with %d cache entries.",
- __FUNCTION__, i );
+ __func__, i );
// Finally set the PMKSA ID Cache in CSR
result = sme_RoamSetPMKIDCache(halHandle,pAdapter->sessionId,
PMKIDCache,
diff --git a/CORE/HDD/src/wlan_hdd_early_suspend.c b/CORE/HDD/src/wlan_hdd_early_suspend.c
index 03d960a..6d96a86 100644
--- a/CORE/HDD/src/wlan_hdd_early_suspend.c
+++ b/CORE/HDD/src/wlan_hdd_early_suspend.c
@@ -627,7 +627,7 @@
if (pAdapter != NULL)
{
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
- "%s: Can't set multicast addr filtering in P2P-GO HDD", __FUNCTION__);
+ "%s: Can't set multicast addr filtering in P2P-GO HDD", __func__);
return VOS_STATUS_E_FAILURE;
}
@@ -637,7 +637,7 @@
if(pAdapter == NULL)
{
- VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,"%s: HDD adapter context is Null", __FUNCTION__);
+ VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,"%s: HDD adapter context is Null", __func__);
return VOS_STATUS_E_FAILURE;
}
}
@@ -650,7 +650,7 @@
pAdapter = hdd_get_adapter(pHddCtx,WLAN_HDD_P2P_CLIENT);
if(pAdapter == NULL)
{
- VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,"%s: HDD adapter context is Null", __FUNCTION__);
+ VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,"%s: HDD adapter context is Null", __func__);
return VOS_STATUS_E_FAILURE;
}
}
@@ -1189,13 +1189,13 @@
pVosContext = vos_get_global_context(VOS_MODULE_ID_SYS, NULL);
if (NULL == pVosContext)
{
- hddLog(LOGE, "%s: Invalid pContext", __FUNCTION__);
+ hddLog(LOGE, "%s: Invalid pContext", __func__);
return;
}
smeContext = vos_get_context(VOS_MODULE_ID_SME, pVosContext);
if (NULL == smeContext)
{
- hddLog(LOGE, "%s: Invalid smeContext", __FUNCTION__);
+ hddLog(LOGE, "%s: Invalid smeContext", __func__);
return;
}
@@ -1216,13 +1216,13 @@
pVosContext = vos_get_global_context(VOS_MODULE_ID_SYS, NULL);
if (NULL == pVosContext)
{
- hddLog(LOGE, "%s: Invalid pContext", __FUNCTION__);
+ hddLog(LOGE, "%s: Invalid pContext", __func__);
return;
}
smeContext = vos_get_context(VOS_MODULE_ID_SME, pVosContext);
if (NULL == smeContext)
{
- hddLog(LOGE, "%s: Invalid smeContext", __FUNCTION__);
+ hddLog(LOGE, "%s: Invalid smeContext", __func__);
return;
}
@@ -1721,7 +1721,7 @@
vosStatus = hdd_wmm_init(pHddCtx);
if ( !VOS_IS_STATUS_SUCCESS( vosStatus ))
{
- hddLog(VOS_TRACE_LEVEL_FATAL, "%s: hdd_wmm_init failed", __FUNCTION__);
+ hddLog(VOS_TRACE_LEVEL_FATAL, "%s: hdd_wmm_init failed", __func__);
goto err_vosclose;
}
@@ -2158,7 +2158,7 @@
vosStatus = hdd_wmm_init(pHddCtx);
if ( !VOS_IS_STATUS_SUCCESS( vosStatus ))
{
- hddLog(VOS_TRACE_LEVEL_FATAL, "%s: hdd_wmm_init failed", __FUNCTION__);
+ hddLog(VOS_TRACE_LEVEL_FATAL, "%s: hdd_wmm_init failed", __func__);
goto err_vosclose;
}
diff --git a/CORE/HDD/src/wlan_hdd_ftm.c b/CORE/HDD/src/wlan_hdd_ftm.c
index d7e8f14..aa7a1bf 100644
--- a/CORE/HDD/src/wlan_hdd_ftm.c
+++ b/CORE/HDD/src/wlan_hdd_ftm.c
@@ -961,7 +961,7 @@
if (vos_event_set(&pVosContext->ProbeEvent)!= VOS_STATUS_SUCCESS)
{
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
- "%s: vos_event_set failed", __FUNCTION__);
+ "%s: vos_event_set failed", __func__);
return;
}
} /* vos_sys_probe_thread_cback() */
@@ -1363,7 +1363,7 @@
if (pVosContext == NULL)
{
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
- "%s: mismatch in context",__FUNCTION__);
+ "%s: mismatch in context",__func__);
goto err_status_failure;
}
@@ -1371,7 +1371,7 @@
if (pVosContext->pBALContext == NULL)
{
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
- "%s: BAL NULL context",__FUNCTION__);
+ "%s: BAL NULL context",__func__);
goto err_status_failure;
}
#endif
@@ -1379,7 +1379,7 @@
if (pVosContext->pMACContext == NULL)
{
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
- "%s: MAC NULL context",__FUNCTION__);
+ "%s: MAC NULL context",__func__);
goto err_status_failure;
}
@@ -4046,8 +4046,8 @@
VOS_STATUS status;
hdd_adapter_t *pAdapter = (netdev_priv(dev));
- VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, "%s: Received length %d", __FUNCTION__, wrqu->data.length);
- VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, "%s: Received data %s", __FUNCTION__, (char*)wrqu->data.pointer);
+ VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, "%s: Received length %d", __func__, wrqu->data.length);
+ VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, "%s: Received data %s", __func__, (char*)wrqu->data.pointer);
switch(sub_cmd)
{
@@ -4080,7 +4080,7 @@
}
default:
{
- hddLog(LOGE, "%s: Invalid sub command %d\n",__FUNCTION__, sub_cmd);
+ hddLog(LOGE, "%s: Invalid sub command %d\n",__func__, sub_cmd);
ret = -EINVAL;
break;
}
@@ -4106,7 +4106,7 @@
if(status != VOS_STATUS_SUCCESS)
{
- hddLog(VOS_TRACE_LEVEL_FATAL,"%s Failed =%d\n",__FUNCTION__, status);
+ hddLog(VOS_TRACE_LEVEL_FATAL,"%s Failed =%d\n",__func__, status);
ret = -EINVAL;
}
@@ -4447,7 +4447,7 @@
default:
{
- VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,"%s: unknown ioctl %d", __FUNCTION__, sub_cmd);
+ VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,"%s: unknown ioctl %d", __func__, sub_cmd);
hddLog(LOGE, "Invalid IOCTL action command %d ", sub_cmd);
break;
}
diff --git a/CORE/HDD/src/wlan_hdd_hostapd.c b/CORE/HDD/src/wlan_hdd_hostapd.c
index 1d21d2d..63c5112 100644
--- a/CORE/HDD/src/wlan_hdd_hostapd.c
+++ b/CORE/HDD/src/wlan_hdd_hostapd.c
@@ -198,7 +198,7 @@
if (NULL == pAdapter)
{
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_FATAL,
- "%s: HDD adapter context is Null", __FUNCTION__);
+ "%s: HDD adapter context is Null", __func__);
ret = -ENODEV;
goto exit;
}
@@ -219,7 +219,7 @@
if (!command)
{
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_FATAL,
- "%s: failed to allocate memory\n", __FUNCTION__);
+ "%s: failed to allocate memory\n", __func__);
ret = -ENOMEM;
goto exit;
}
@@ -253,7 +253,7 @@
if(strncmp(command, "SET_SAP_CHANNEL_LIST", 20) == 0)
{
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
- " Received Command to Set Preferred Channels for SAP in %s", __FUNCTION__);
+ " Received Command to Set Preferred Channels for SAP in %s", __func__);
ret = sapSetPreferredChannel(dev,command);
}
@@ -798,9 +798,9 @@
&dot11RSNIE);
// Copy out the encryption and authentication types
hddLog(LOG1, FL("%s: pairwise cipher suite count: %d\n"),
- __FUNCTION__, dot11RSNIE.pwise_cipher_suite_count );
+ __func__, dot11RSNIE.pwise_cipher_suite_count );
hddLog(LOG1, FL("%s: authentication suite count: %d\n"),
- __FUNCTION__, dot11RSNIE.akm_suite_count);
+ __func__, dot11RSNIE.akm_suite_count);
/*Here we have followed the apple base code,
but probably I suspect we can do something different*/
//dot11RSNIE.akm_suite_count
@@ -833,9 +833,9 @@
&dot11WPAIE);
// Copy out the encryption and authentication types
hddLog(LOG1, FL("%s: WPA unicast cipher suite count: %d\n"),
- __FUNCTION__, dot11WPAIE.unicast_cipher_count );
+ __func__, dot11WPAIE.unicast_cipher_count );
hddLog(LOG1, FL("%s: WPA authentication suite count: %d\n"),
- __FUNCTION__, dot11WPAIE.auth_suite_count);
+ __func__, dot11WPAIE.auth_suite_count);
//dot11WPAIE.auth_suite_count
// Just translate the FIRST one
*pAuthType = hdd_TranslateWPAToCsrAuthType(dot11WPAIE.auth_suites[0]);
@@ -846,7 +846,7 @@
}
else
{
- hddLog(LOGW, FL("%s: gen_ie[0]: %d\n"), __FUNCTION__, gen_ie[0]);
+ hddLog(LOGW, FL("%s: gen_ie[0]: %d\n"), __func__, gen_ie[0]);
return VOS_STATUS_E_FAILURE;
}
return VOS_STATUS_SUCCESS;
@@ -921,7 +921,7 @@
{
hddLog(VOS_TRACE_LEVEL_ERROR,
"%s: QCSAP_PARAM_HIDE_SSID failed",
- __FUNCTION__);
+ __func__);
return status;
}
break;
@@ -972,11 +972,11 @@
case QCSAP_PARAM_MODULE_DOWN_IND:
{
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
- "%s: sending WLAN_MODULE_DOWN_IND", __FUNCTION__);
+ "%s: sending WLAN_MODULE_DOWN_IND", __func__);
send_btc_nlink_msg(WLAN_MODULE_DOWN_IND, 0);
#ifdef WLAN_BTAMP_FEATURE
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
- "%s: Take down AMP PAL", __FUNCTION__);
+ "%s: Take down AMP PAL", __func__);
BSL_Deinit(vos_get_global_context(VOS_MODULE_ID_HDD, NULL));
#endif
*value = 0;
@@ -1046,7 +1046,7 @@
cmd = (int)(*(value+i));
hddLog(LOG1, "%s: SAP Modify ACL arg0 %02x:%02x:%02x:%02x:%02x:%02x arg1 %d arg2 %d\n",
- __FUNCTION__, pPeerStaMac[0], pPeerStaMac[1], pPeerStaMac[2],
+ __func__, pPeerStaMac[0], pPeerStaMac[1], pPeerStaMac[2],
pPeerStaMac[3], pPeerStaMac[4], pPeerStaMac[5], listType, cmd);
if (WLANSAP_ModifyACL(pVosContext, pPeerStaMac,(eSapACLType)listType,(eSapACLCmdType)cmd)
@@ -1090,7 +1090,7 @@
if(copy_from_user((char *) value, (char*)(wrqu->data.pointer), cmd_len)) {
hddLog(VOS_TRACE_LEVEL_FATAL, "%s -- copy_from_user --data pointer failed! bailing",
- __FUNCTION__);
+ __func__);
kfree(value);
return -EFAULT;
}
@@ -1642,7 +1642,7 @@
default:
- hddLog(LOGW, "%s called with unsupported auth type %d", __FUNCTION__,
+ hddLog(LOGW, "%s called with unsupported auth type %d", __func__,
wrqu->param.flags & IW_AUTH_INDEX);
break;
}
@@ -1711,9 +1711,9 @@
break;
}
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, "%s: Remove key cipher_alg:%d key_len%d *pEncryptionType :%d \n",
- __FUNCTION__,(int)ext->alg,(int)ext->key_len,RemoveKey.encType);
+ __func__,(int)ext->alg,(int)ext->key_len,RemoveKey.encType);
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, "%s: Peer Mac = "MAC_ADDRESS_STR"\n",
- __FUNCTION__, MAC_ADDR_ARRAY(RemoveKey.peerMac));
+ __func__, MAC_ADDR_ARRAY(RemoveKey.peerMac));
);
vstatus = WLANSAP_DelKeySta( pVosContext, &RemoveKey);
if ( vstatus != VOS_STATUS_SUCCESS )
@@ -1764,7 +1764,7 @@
case IW_ENCODE_ALG_WEP:
setKey.encType = (ext->key_len== 5) ? eCSR_ENCRYPT_TYPE_WEP40:eCSR_ENCRYPT_TYPE_WEP104;
pHddApCtx->uPrivacy = 1;
- hddLog(LOG1, "(%s) uPrivacy=%d", __FUNCTION__, pHddApCtx->uPrivacy);
+ hddLog(LOG1, "(%s) uPrivacy=%d", __func__, pHddApCtx->uPrivacy);
break;
case IW_ENCODE_ALG_TKIP:
@@ -1812,7 +1812,7 @@
}
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
- ("%s:EncryptionType:%d key_len:%d, :%d, KeyId:%d \n"),__FUNCTION__, setKey.encType, setKey.keyLength,
+ ("%s:EncryptionType:%d key_len:%d, :%d, KeyId:%d \n"),__func__, setKey.encType, setKey.keyLength,
setKey.keyId);
for(i=0; i< ext->key_len; i++)
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
@@ -1860,7 +1860,7 @@
//clear all the reason codes
if (status != 0)
{
- hddLog(LOGE,"%s %d Command Disassociate/Deauthenticate : csrRoamDisconnect failure returned %d \n", __FUNCTION__, (int)mlme->cmd, (int)status );
+ hddLog(LOGE,"%s %d Command Disassociate/Deauthenticate : csrRoamDisconnect failure returned %d \n", __func__, (int)mlme->cmd, (int)status );
}
netif_stop_queue(dev);
@@ -1868,10 +1868,10 @@
}
else
{
- hddLog(LOGE,"%s %d Command Disassociate/Deauthenticate called but station is not in associated state \n", __FUNCTION__, (int)mlme->cmd );
+ hddLog(LOGE,"%s %d Command Disassociate/Deauthenticate called but station is not in associated state \n", __func__, (int)mlme->cmd );
}
default:
- hddLog(LOGE,"%s %d Command should be Disassociate/Deauthenticate \n", __FUNCTION__, (int)mlme->cmd );
+ hddLog(LOGE,"%s %d Command should be Disassociate/Deauthenticate \n", __func__, (int)mlme->cmd );
return -EINVAL;
}//end of switch
EXIT();
@@ -1987,7 +1987,7 @@
}
vos_mem_zero(pSap_WPSIe, sizeof(tSap_WPSIE));
- hddLog(LOG1,"%s WPS IE type[0x%X] IE[0x%X], LEN[%d]\n", __FUNCTION__, wps_genie[0], wps_genie[1], wps_genie[2]);
+ hddLog(LOG1,"%s WPS IE type[0x%X] IE[0x%X], LEN[%d]\n", __func__, wps_genie[0], wps_genie[1], wps_genie[2]);
WPSIeType = wps_genie[0];
if ( wps_genie[0] == eQC_WPS_BEACON_IE)
{
@@ -2003,7 +2003,7 @@
}
else if (memcmp(&wps_genie[2], "\x00\x50\xf2\x04", 4) == 0)
{
- hddLog (LOG1, "%s Set WPS BEACON IE(len %d)",__FUNCTION__, wps_genie[1]+2);
+ hddLog (LOG1, "%s Set WPS BEACON IE(len %d)",__func__, wps_genie[1]+2);
pos = &wps_genie[6];
while (((size_t)pos - (size_t)&wps_genie[6]) < (wps_genie[1] - 4) )
{
@@ -2078,12 +2078,12 @@
}
else {
hddLog (LOGE, "%s WPS IE Mismatch %X",
- __FUNCTION__, wps_genie[0]);
+ __func__, wps_genie[0]);
}
break;
default:
- hddLog (LOGE, "%s Set UNKNOWN IE %X",__FUNCTION__, wps_genie[0]);
+ hddLog (LOGE, "%s Set UNKNOWN IE %X",__func__, wps_genie[0]);
vos_mem_free(pSap_WPSIe);
return 0;
}
@@ -2102,7 +2102,7 @@
}
else if (memcmp(&wps_genie[2], "\x00\x50\xf2\x04", 4) == 0)
{
- hddLog (LOG1, "%s Set WPS PROBE RSP IE(len %d)",__FUNCTION__, wps_genie[1]+2);
+ hddLog (LOG1, "%s Set WPS PROBE RSP IE(len %d)",__func__, wps_genie[1]+2);
pos = &wps_genie[6];
while (((size_t)pos - (size_t)&wps_genie[6]) < (wps_genie[1] - 4) )
{
@@ -2247,7 +2247,7 @@
}
else
{
- hddLog (LOGE, "%s WPS IE Mismatch %X",__FUNCTION__, wps_genie[0]);
+ hddLog (LOGE, "%s WPS IE Mismatch %X",__func__, wps_genie[0]);
}
} // switch
@@ -2346,7 +2346,7 @@
break;
default:
- hddLog (LOGE, "%s Set UNKNOWN IE %X",__FUNCTION__, genie[0]);
+ hddLog (LOGE, "%s Set UNKNOWN IE %X",__func__, genie[0]);
halStatus = 0;
}
@@ -2381,7 +2381,7 @@
{
hddLog(VOS_TRACE_LEVEL_ERROR,
"%s: Unable to retrieve statistics for link speed",
- __FUNCTION__);
+ __func__);
}
else
{
@@ -2392,7 +2392,7 @@
{
hddLog(VOS_TRACE_LEVEL_ERROR,
"%s: SME %s while retrieving link speed",
- __FUNCTION__, (0 == lrc) ? "timeout" : "interrupt");
+ __func__, (0 == lrc) ? "timeout" : "interrupt");
msleep(50);
}
}
@@ -2432,7 +2432,7 @@
status = wlan_hdd_get_classAstats_for_station(pHostapdAdapter , staId);
if (!VOS_IS_STATUS_SUCCESS(status ))
{
- hddLog(VOS_TRACE_LEVEL_ERROR, "%s: Unable to retrieve SME statistics", __FUNCTION__);
+ hddLog(VOS_TRACE_LEVEL_ERROR, "%s: Unable to retrieve SME statistics", __func__);
return -EINVAL;
}
link_speed =(int)pHostapdAdapter->hdd_stats.ClassA_stat.tx_rate/2;
@@ -2445,7 +2445,7 @@
// encoding or length error?
hddLog(VOS_TRACE_LEVEL_ERROR,
"%s: Unable to encode link speed, got [%s]",
- __FUNCTION__, pLinkSpeed);
+ __func__, pLinkSpeed);
return -EIO;
}
@@ -2717,7 +2717,7 @@
status = hdd_softap_init_tx_rx(pAdapter);
if ( !VOS_IS_STATUS_SUCCESS( status ))
{
- hddLog(VOS_TRACE_LEVEL_FATAL, "%s: hdd_softap_init_tx_rx failed", __FUNCTION__);
+ hddLog(VOS_TRACE_LEVEL_FATAL, "%s: hdd_softap_init_tx_rx failed", __func__);
}
#ifdef CONFIG_CFG80211
diff --git a/CORE/HDD/src/wlan_hdd_main.c b/CORE/HDD/src/wlan_hdd_main.c
index a4ba6a7..107dfc3 100644
--- a/CORE/HDD/src/wlan_hdd_main.c
+++ b/CORE/HDD/src/wlan_hdd_main.c
@@ -239,16 +239,16 @@
{
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
"%s: Timeout occured while waiting for abortscan" ,
- __FUNCTION__);
+ __func__);
}
}
else
{
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
- "%s: Scan is not Pending from user" , __FUNCTION__);
+ "%s: Scan is not Pending from user" , __func__);
}
#ifdef WLAN_BTAMP_FEATURE
- VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,"%s: disabling AMP", __FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,"%s: disabling AMP", __func__);
status = WLANBAP_StopAmp();
if(VOS_STATUS_SUCCESS != status )
{
@@ -356,7 +356,7 @@
if (NULL == pAdapter)
{
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_FATAL,
- "%s: HDD adapter context is Null", __FUNCTION__);
+ "%s: HDD adapter context is Null", __func__);
ret = -ENODEV;
goto exit;
}
@@ -377,7 +377,7 @@
if (!command)
{
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_FATAL,
- "%s: failed to allocate memory\n", __FUNCTION__);
+ "%s: failed to allocate memory\n", __func__);
ret = -ENOMEM;
goto exit;
}
@@ -401,7 +401,7 @@
sizeof(tSirMacAddr)))
{
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_FATAL,
- "%s: failed to copy data to user buffer\n", __FUNCTION__);
+ "%s: failed to copy data to user buffer\n", __func__);
ret = -EFAULT;
}
}
@@ -415,7 +415,7 @@
/* First 8 bytes will have "SETBAND " and
* 9 byte will have band setting value */
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
- "%s: SetBandCommand Info comm %s UL %d, TL %d", __FUNCTION__, priv_data.buf, priv_data.used_len, priv_data.total_len);
+ "%s: SetBandCommand Info comm %s UL %d, TL %d", __func__, priv_data.buf, priv_data.used_len, priv_data.total_len);
/* Change band request received */
ret = hdd_setBand_helper(dev, ptr);
@@ -443,7 +443,7 @@
tANI_U8 *ptr = (tANI_U8*)priv_data.buf;
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
- " Received Command to Set Preferred Channels for SAP in %s", __FUNCTION__);
+ " Received Command to Set Preferred Channels for SAP in %s", __func__);
ret = sapSetPreferredChannel(dev, ptr);
}
@@ -483,7 +483,7 @@
if (NULL == pAdapter)
{
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_FATAL,
- "%s: HDD adapter context is Null", __FUNCTION__);
+ "%s: HDD adapter context is Null", __func__);
return -ENODEV;
}
@@ -491,7 +491,7 @@
if (NULL == pHddCtx)
{
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_FATAL,
- "%s: HDD context is Null", __FUNCTION__);
+ "%s: HDD context is Null", __func__);
return -ENODEV;
}
@@ -526,7 +526,7 @@
if (hdd_connIsConnected(WLAN_HDD_GET_STATION_CTX_PTR(pAdapter)))
{
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
- "%s: Enabling Tx Queues", __FUNCTION__);
+ "%s: Enabling Tx Queues", __func__);
/* Enable TX queues only when we are connected */
netif_tx_start_all_queues(dev);
}
@@ -540,7 +540,7 @@
if(pAdapter == NULL) {
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_FATAL,
- "%s: HDD adapter context is Null", __FUNCTION__);
+ "%s: HDD adapter context is Null", __func__);
return -1;
}
@@ -573,7 +573,7 @@
if (NULL == pAdapter)
{
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_FATAL,
- "%s: HDD adapter context is Null", __FUNCTION__);
+ "%s: HDD adapter context is Null", __func__);
return -ENODEV;
}
@@ -581,7 +581,7 @@
if (NULL == pHddCtx)
{
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_FATAL,
- "%s: HDD context is Null", __FUNCTION__);
+ "%s: HDD context is Null", __func__);
return -ENODEV;
}
@@ -1965,12 +1965,12 @@
if (!VOS_IS_STATUS_SUCCESS(status))
{
hddLog(LOGE, "%s: failure waiting for WLANSAP_StopBss",
- __FUNCTION__);
+ __func__);
}
}
else
{
- hddLog(LOGE, "%s: failure in WLANSAP_StopBss", __FUNCTION__);
+ hddLog(LOGE, "%s: failure in WLANSAP_StopBss", __func__);
}
clear_bit(SOFTAP_BSS_STARTED, &pAdapter->event_flags);
@@ -1980,7 +1980,7 @@
{
hddLog(LOGE,
"%s: Failed to set WNI_CFG_PROBE_RSP_BCN_ADDNIE_FLAG",
- __FUNCTION__);
+ __func__);
}
if ( eHAL_STATUS_FAILURE == ccmCfgSetInt((WLAN_HDD_GET_CTX(pAdapter))->hHal,
@@ -2475,25 +2475,25 @@
if (NULL == pHddCtx)
{
hddLog(VOS_TRACE_LEVEL_ERROR,
- "%s: HDD context is Null", __FUNCTION__);
+ "%s: HDD context is Null", __func__);
return;
}
if (dev->flags & IFF_ALLMULTI)
{
hddLog(VOS_TRACE_LEVEL_INFO,
- "%s: allow all multicast frames", __FUNCTION__);
+ "%s: allow all multicast frames", __func__);
pHddCtx->mc_addr_list.mc_cnt = 0;
}
else
{
mc_count = netdev_mc_count(dev);
hddLog(VOS_TRACE_LEVEL_INFO,
- "%s: mc_count = %u", __FUNCTION__, mc_count);
+ "%s: mc_count = %u", __func__, mc_count);
if (mc_count > WLAN_HDD_MAX_MC_ADDR_LIST)
{
hddLog(VOS_TRACE_LEVEL_INFO,
- "%s: No free filter available; allow all multicast frames", __FUNCTION__);
+ "%s: No free filter available; allow all multicast frames", __func__);
pHddCtx->mc_addr_list.mc_cnt = 0;
return;
}
@@ -2630,7 +2630,7 @@
{
hddLog(VOS_TRACE_LEVEL_ERROR,
"%s: Bad param, context [%p]",
- __FUNCTION__, callbackContext);
+ __func__, callbackContext);
return;
}
@@ -2644,7 +2644,7 @@
/* the caller presumably timed out so there is nothing we can do */
hddLog(VOS_TRACE_LEVEL_WARN,
"%s: Invalid context, magic [%08x]",
- __FUNCTION__, pContext->magic);
+ __func__, pContext->magic);
return;
}
@@ -2806,7 +2806,7 @@
if (lrc <= 0)
{
hddLog(VOS_TRACE_LEVEL_ERROR, "%s: %s while requesting full power",
- __FUNCTION__, (0 == lrc) ? "timeout" : "interrupt");
+ __func__, (0 == lrc) ? "timeout" : "interrupt");
/* there is a race condition such that the callback
function could be executing at the same time we are. of
primary concern is if the callback function had already
@@ -2821,7 +2821,7 @@
{
hddLog(VOS_TRACE_LEVEL_ERROR,
"%s: Request for Full Power failed, status %d",
- __FUNCTION__, halStatus);
+ __func__, halStatus);
VOS_ASSERT(0);
/* continue -- need to clean up as much as possible */
}
@@ -3237,7 +3237,7 @@
{
hddLog(VOS_TRACE_LEVEL_FATAL,
"%s: unable to retrieve WCNSS WLAN compiled version",
- __FUNCTION__);
+ __func__);
break;
}
@@ -3247,7 +3247,7 @@
{
hddLog(VOS_TRACE_LEVEL_FATAL,
"%s: unable to retrieve WCNSS WLAN reported version",
- __FUNCTION__);
+ __func__);
break;
}
@@ -3285,7 +3285,7 @@
{
hddLog(VOS_TRACE_LEVEL_FATAL,
"%s: unable to retrieve WCNSS software version string",
- __FUNCTION__);
+ __func__);
break;
}
@@ -3299,7 +3299,7 @@
{
hddLog(VOS_TRACE_LEVEL_FATAL,
"%s: unable to retrieve WCNSS hardware version string",
- __FUNCTION__);
+ __func__);
break;
}
@@ -3581,7 +3581,7 @@
status = hdd_wmm_init(pHddCtx);
if (!VOS_IS_STATUS_SUCCESS(status))
{
- hddLog(VOS_TRACE_LEVEL_FATAL, "%s: hdd_wmm_init failed", __FUNCTION__);
+ hddLog(VOS_TRACE_LEVEL_FATAL, "%s: hdd_wmm_init failed", __func__);
goto err_vosclose;
}
@@ -3724,7 +3724,7 @@
{
hddLog(VOS_TRACE_LEVEL_FATAL,
"%s: Failed to allocate mac_address for p2p_device",
- __FUNCTION__);
+ __func__);
goto err_close_adapter;
}
@@ -3734,7 +3734,7 @@
{
hddLog(VOS_TRACE_LEVEL_FATAL,
"%s: Failed to do hdd_open_adapter for P2P Device Interface",
- __FUNCTION__);
+ __func__);
goto err_close_adapter;
}
#endif
@@ -4535,7 +4535,7 @@
}
/* we are in an invalid state :( */
- hddLog(LOGE, "%s: Invalid context", __FUNCTION__);
+ hddLog(LOGE, "%s: Invalid context", __func__);
return VOS_STA;
}
diff --git a/CORE/HDD/src/wlan_hdd_oemdata.c b/CORE/HDD/src/wlan_hdd_oemdata.c
index 9643cba..24b4de0 100644
--- a/CORE/HDD/src/wlan_hdd_oemdata.c
+++ b/CORE/HDD/src/wlan_hdd_oemdata.c
@@ -68,12 +68,12 @@
if(oemDataReqStatus == eOEM_DATA_REQ_FAILURE)
{
snprintf(buffer, IW_CUSTOM_MAX, "QCOM: OEM-DATA-REQ-FAILED");
- hddLog(LOGW, "%s: oem data req %d failed\n", __FUNCTION__, oemDataReqID);
+ hddLog(LOGW, "%s: oem data req %d failed\n", __func__, oemDataReqID);
}
else if(oemDataReqStatus == eOEM_DATA_REQ_INVALID_MODE)
{
snprintf(buffer, IW_CUSTOM_MAX, "QCOM: OEM-DATA-REQ-INVALID-MODE");
- hddLog(LOGW, "%s: oem data req %d failed because the driver is in invalid mode (IBSS|BTAMP|AP)\n", __FUNCTION__, oemDataReqID);
+ hddLog(LOGW, "%s: oem data req %d failed because the driver is in invalid mode (IBSS|BTAMP|AP)\n", __func__, oemDataReqID);
}
else
{
@@ -123,7 +123,7 @@
status = sme_getOemDataRsp(WLAN_HDD_GET_HAL_CTX(pAdapter), &pSmeOemDataRsp);
if(status != eHAL_STATUS_SUCCESS)
{
- hddLog(LOGE, "%s: failed in sme_getOemDataRsp\n", __FUNCTION__);
+ hddLog(LOGE, "%s: failed in sme_getOemDataRsp\n", __func__);
break;
}
else
@@ -135,7 +135,7 @@
}
else
{
- hddLog(LOGE, "%s: pSmeOemDataRsp = NULL\n", __FUNCTION__);
+ hddLog(LOGE, "%s: pSmeOemDataRsp = NULL\n", __func__);
status = eHAL_STATUS_FAILURE;
break;
}
@@ -186,7 +186,7 @@
if(pOemDataReq == NULL)
{
- hddLog(LOGE, "in %s oemDataReq == NULL\n", __FUNCTION__);
+ hddLog(LOGE, "in %s oemDataReq == NULL\n", __func__);
status = eHAL_STATUS_FAILURE;
break;
}
diff --git a/CORE/HDD/src/wlan_hdd_scan.c b/CORE/HDD/src/wlan_hdd_scan.c
index 23463cb..68fcf7d 100644
--- a/CORE/HDD/src/wlan_hdd_scan.c
+++ b/CORE/HDD/src/wlan_hdd_scan.c
@@ -265,7 +265,7 @@
break;
default:
hddLog( LOGW, "%s: Unknown network type [%d]",
- __FUNCTION__, descriptor->nwType);
+ __func__, descriptor->nwType);
modestr = "?";
break;
}
@@ -560,7 +560,7 @@
ENTER();
hddLog(LOGW,"%s called with halHandle = %p, pContext = %p, scanID = %d,"
- " returned status = %d", __FUNCTION__, halHandle, pContext,
+ " returned status = %d", __func__, halHandle, pContext,
(int) scanId, (int) status);
/* if there is a scan request pending when the wlan driver is unloaded
@@ -570,7 +570,7 @@
if (pAdapter->dev != dev)
{
hddLog(LOGW, "%s: device mismatch %p vs %p",
- __FUNCTION__, pAdapter->dev, dev);
+ __func__, pAdapter->dev, dev);
return eHAL_STATUS_SUCCESS;
}
@@ -578,7 +578,7 @@
if (pHddCtx->scan_info.scanId != scanId)
{
hddLog(LOGW, "%s called with mismatched scanId pHddCtx->scan_info.scanId = %d "
- "scanId = %d ", __FUNCTION__, (int) pHddCtx->scan_info.scanId,
+ "scanId = %d ", __func__, (int) pHddCtx->scan_info.scanId,
(int) scanId);
}
@@ -677,7 +677,7 @@
else
{
scanRequest.SSIDs.numOfSSIDs = 0;
- VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR, "%s: Unable to allocate memory",__FUNCTION__);
+ VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR, "%s: Unable to allocate memory",__func__);
VOS_ASSERT(0);
}
}
@@ -858,14 +858,14 @@
ENTER();
hddLog(LOG1,"%s called with halHandle = %p, pContext = %p, scanID = %d,"
- " returned status = %d", __FUNCTION__, halHandle, pContext,
+ " returned status = %d", __func__, halHandle, pContext,
(int) scanId, (int) status);
/* Check the scanId */
if (pwextBuf->scanId != scanId)
{
hddLog(LOGW, "%s called with mismatched scanId pWextState->scanId = %d "
- "scanId = %d ", __FUNCTION__, (int) pwextBuf->scanId,
+ "scanId = %d ", __func__, (int) pwextBuf->scanId,
(int) scanId);
}
diff --git a/CORE/HDD/src/wlan_hdd_softap_tx_rx.c b/CORE/HDD/src/wlan_hdd_softap_tx_rx.c
index aea53b8..a6c0392 100644
--- a/CORE/HDD/src/wlan_hdd_softap_tx_rx.c
+++ b/CORE/HDD/src/wlan_hdd_softap_tx_rx.c
@@ -66,13 +66,13 @@
#if 0
static void hdd_softap_dump_sk_buff(struct sk_buff * skb)
{
- VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_ERROR,"%s: head = %p ", __FUNCTION__, skb->head);
- //VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_ERROR,"%s: data = %p ", __FUNCTION__, skb->data);
- VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_ERROR,"%s: tail = %p ", __FUNCTION__, skb->tail);
- VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_ERROR,"%s: end = %p ", __FUNCTION__, skb->end);
- VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_ERROR,"%s: len = %d ", __FUNCTION__, skb->len);
- VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_ERROR,"%s: data_len = %d ", __FUNCTION__, skb->data_len);
- VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_ERROR,"%s: mac_len = %d\n", __FUNCTION__, skb->mac_len);
+ VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_ERROR,"%s: head = %p ", __func__, skb->head);
+ //VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_ERROR,"%s: data = %p ", __func__, skb->data);
+ VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_ERROR,"%s: tail = %p ", __func__, skb->tail);
+ VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_ERROR,"%s: end = %p ", __func__, skb->end);
+ VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_ERROR,"%s: len = %d ", __func__, skb->len);
+ VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_ERROR,"%s: data_len = %d ", __func__, skb->data_len);
+ VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_ERROR,"%s: mac_len = %d\n", __func__, skb->mac_len);
VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_ERROR,"0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x ",
skb->data[0], skb->data[1], skb->data[2], skb->data[3], skb->data[4],
@@ -171,7 +171,7 @@
++pAdapter->hdd_stats.hddTxRxStats.txXmitCalled;
VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_INFO,
- "%s: enter", __FUNCTION__);
+ "%s: enter", __func__);
spin_lock_bh( &pAdapter->staInfo_lock );
if (vos_is_macaddr_broadcast( pDestMacAddress ) || vos_is_macaddr_group(pDestMacAddress))
@@ -185,7 +185,7 @@
skb->queue_mapping = HDD_LINUX_AC_BE;
VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_INFO_LOW,
- "%s: BC/MC packet\n", __FUNCTION__);
+ "%s: BC/MC packet\n", __func__);
}
else
{
@@ -193,7 +193,7 @@
if (STAId == HDD_WLAN_INVALID_STA_ID)
{
VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_WARN,
- "%s: Failed to find right station", __FUNCTION__);
+ "%s: Failed to find right station", __func__);
++pAdapter->stats.tx_dropped;
++pAdapter->hdd_stats.hddTxRxStats.txXmitDropped;
kfree_skb(skb);
@@ -201,7 +201,7 @@
}
else if (FALSE == pAdapter->aStaInfo[STAId].isUsed )
{
- VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_WARN,"%s: STA is unregistered", __FUNCTION__, STAId);
+ VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_WARN,"%s: STA is unregistered", __func__, STAId);
++pAdapter->stats.tx_dropped;
++pAdapter->hdd_stats.hddTxRxStats.txXmitDropped;
kfree_skb(skb);
@@ -212,7 +212,7 @@
(WLANTL_STA_AUTHENTICATED != pAdapter->aStaInfo[STAId].tlSTAState) )
{
VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_WARN,
- "%s: Station not connected yet", __FUNCTION__);
+ "%s: Station not connected yet", __func__);
++pAdapter->stats.tx_dropped;
++pAdapter->hdd_stats.hddTxRxStats.txXmitDropped;
kfree_skb(skb);
@@ -223,7 +223,7 @@
if(ntohs(skb->protocol) != HDD_ETHERTYPE_802_1_X)
{
VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_WARN,
- "%s: NON-EAPOL packet in non-Authenticated state", __FUNCTION__);
+ "%s: NON-EAPOL packet in non-Authenticated state", __func__);
++pAdapter->stats.tx_dropped;
++pAdapter->hdd_stats.hddTxRxStats.txXmitDropped;
kfree_skb(skb);
@@ -240,7 +240,7 @@
++pAdapter->hdd_stats.hddTxRxStats.txXmitClassifiedAC[ac];
VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_INFO,
- "%s: Classified as ac %d up %d", __FUNCTION__, ac, up);
+ "%s: Classified as ac %d up %d", __func__, ac, up);
// If the memory differentiation mode is enabled, the memory limit of each queue will be
// checked. Over-limit packets will be dropped.
@@ -249,7 +249,7 @@
if(pktListSize >= pAdapter->aTxQueueLimit[ac])
{
VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_WARN,
- "%s: station %d ac %d queue over limit %d \n", __FUNCTION__, STAId, ac, pktListSize);
+ "%s: station %d ac %d queue over limit %d \n", __func__, STAId, ac, pktListSize);
pAdapter->aStaInfo[STAId].txSuspended[ac] = VOS_TRUE;
netif_stop_subqueue(dev, skb_get_queue_mapping(skb));
txSuspended = VOS_TRUE;
@@ -260,7 +260,7 @@
{
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_WARN,
"%s: TX queue full for AC=%d Disable OS TX queue",
- __FUNCTION__, ac );
+ __func__, ac );
os_status = NETDEV_TX_BUSY;
goto xmit_done;
}
@@ -282,7 +282,7 @@
if ( !VOS_IS_STATUS_SUCCESS( status ) )
{
- VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_WARN,"%s:Insert Tx queue failed. Pkt dropped", __FUNCTION__);
+ VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_WARN,"%s:Insert Tx queue failed. Pkt dropped", __func__);
++pAdapter->hdd_stats.hddTxRxStats.txXmitDropped;
++pAdapter->hdd_stats.hddTxRxStats.txXmitDroppedAC[ac];
++pAdapter->stats.tx_dropped;
@@ -301,7 +301,7 @@
if ( !VOS_IS_STATUS_SUCCESS( status ) )
{
VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_WARN, "%s: Failed to signal TL for AC=%d STAId =%d",
- __FUNCTION__, ac, STAId );
+ __func__, ac, STAId );
//Remove the packet from queue. It must be at the back of the queue, as TX thread cannot preempt us in the middle
//as we are in a soft irq context. Also it must be the same packet that we just allocated.
@@ -317,7 +317,7 @@
}
dev->trans_start = jiffies;
- VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_INFO_LOW, "%s: exit \n", __FUNCTION__);
+ VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_INFO_LOW, "%s: exit \n", __func__);
xmit_done:
spin_unlock_bh( &pAdapter->staInfo_lock );
@@ -350,13 +350,13 @@
++pAdapter->hdd_stats.hddTxRxStats.txXmitCalled;
VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_INFO,
- "%s: enter", __FUNCTION__);
+ "%s: enter", __func__);
spin_lock_bh( &pAdapter->staInfo_lock );
if ( FALSE == pAdapter->aStaInfo[STAId].isUsed )
{
VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_WARN,
- "%s: STA is unregistered", __FUNCTION__, STAId );
+ "%s: STA is unregistered", __func__, STAId );
kfree_skb(skb);
status = VOS_STATUS_E_FAILURE;
goto xmit_end;
@@ -369,7 +369,7 @@
ac = hddWmmUpToAcMap[up];
++pAdapter->hdd_stats.hddTxRxStats.txXmitClassifiedAC[ac];
VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_INFO,
- "%s: Classified as ac %d up %d", __FUNCTION__, ac, up);
+ "%s: Classified as ac %d up %d", __func__, ac, up);
skb->queue_mapping = hddLinuxUpToAcMap[up];
@@ -390,7 +390,7 @@
pktListSize >= pAdapter->aTxQueueLimit[ac])
{
VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_WARN,
- "%s: station %d ac %d queue over limit %d \n", __FUNCTION__, STAId, ac, pktListSize);
+ "%s: station %d ac %d queue over limit %d \n", __func__, STAId, ac, pktListSize);
/* TODO:Rx Flowchart should be trigerred here to SUPEND SSC on RX side.
* SUSPEND should be done based on Threshold. RESUME would be
* triggered in fetch cbk after recovery.
@@ -405,7 +405,7 @@
if ( !VOS_IS_STATUS_SUCCESS( status ) )
{
- VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_WARN,"%s:Insert Tx queue failed. Pkt dropped", __FUNCTION__);
+ VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_WARN,"%s:Insert Tx queue failed. Pkt dropped", __func__);
++pAdapter->hdd_stats.hddTxRxStats.txXmitDropped;
++pAdapter->hdd_stats.hddTxRxStats.txXmitDroppedAC[ac];
++pAdapter->stats.tx_dropped;
@@ -420,13 +420,13 @@
if (1 == pktListSize)
{
//Let TL know we have a packet to send for this AC
- //VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_ERROR,"%s:Indicating Packet to TL", __FUNCTION__);
+ //VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_ERROR,"%s:Indicating Packet to TL", __func__);
status = WLANTL_STAPktPending( (WLAN_HDD_GET_CTX(pAdapter))->pvosContext, STAId, ac );
if ( !VOS_IS_STATUS_SUCCESS( status ) )
{
VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_WARN, "%s: Failed to signal TL for AC=%d STAId =%d",
- __FUNCTION__, ac, STAId );
+ __func__, ac, STAId );
//Remove the packet from queue. It must be at the back of the queue, as TX thread cannot preempt us in the middle
//as we are in a soft irq context. Also it must be the same packet that we just allocated.
@@ -442,7 +442,7 @@
}
}
- VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_INFO_LOW, "%s: exit \n", __FUNCTION__);
+ VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_INFO_LOW, "%s: exit \n", __func__);
xmit_end:
spin_unlock_bh( &pAdapter->staInfo_lock );
@@ -460,7 +460,7 @@
void hdd_softap_tx_timeout(struct net_device *dev)
{
VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_ERROR,
- "%s: Transmission timeout occurred", __FUNCTION__);
+ "%s: Transmission timeout occurred", __func__);
//Getting here implies we disabled the TX queues for too long. Queues are
//disabled either because of disassociation or low resource scenarios. In
//case of disassociation it is ok to ignore this. But if associated, we have
@@ -620,7 +620,7 @@
spin_lock_bh( &pAdapter->staInfo_lock );
if (pAdapter->aStaInfo[STAId].isUsed)
{
- VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_ERROR, "%s: Reinit station %d", __FUNCTION__, STAId );
+ VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_ERROR, "%s: Reinit station %d", __func__, STAId );
spin_unlock_bh( &pAdapter->staInfo_lock );
return VOS_STATUS_E_FAILURE;
}
@@ -662,7 +662,7 @@
if (FALSE == pAdapter->aStaInfo[STAId].isUsed)
{
VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_ERROR,
- "%s: Deinit station not inited %d", __FUNCTION__, STAId );
+ "%s: Deinit station not inited %d", __func__, STAId );
spin_unlock_bh( &pAdapter->staInfo_lock );
return VOS_STATUS_E_FAILURE;
}
@@ -695,7 +695,7 @@
if (txSuspended[ac])
{
VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_INFO,
- "%s: TX queue re-enabled", __FUNCTION__);
+ "%s: TX queue re-enabled", __func__);
netif_wake_subqueue(pAdapter->dev, ac);
}
}
@@ -740,7 +740,7 @@
if( ( NULL == vosContext ) || ( NULL == pVosPacket ) )
{
- VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_ERROR,"%s: Null params being passed", __FUNCTION__);
+ VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_ERROR,"%s: Null params being passed", __func__);
return VOS_STATUS_E_FAILURE;
}
@@ -749,7 +749,7 @@
if(!VOS_IS_STATUS_SUCCESS( status ))
{
//This is bad but still try to free the VOSS resources if we can
- VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_ERROR,"%s: Failure extracting skb from vos pkt", __FUNCTION__);
+ VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_ERROR,"%s: Failure extracting skb from vos pkt", __func__);
vos_pkt_return_packet( pVosPacket );
return VOS_STATUS_E_FAILURE;
}
@@ -758,7 +758,7 @@
pAdapter = (hdd_adapter_t *)netdev_priv(((struct sk_buff *)pOsPkt)->dev);
if(pAdapter == NULL)
{
- VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_ERROR,"%s: HDD adapter context is Null", __FUNCTION__);
+ VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_ERROR,"%s: HDD adapter context is Null", __func__);
}
else
{
@@ -771,7 +771,7 @@
status = vos_pkt_return_packet( pVosPacket );
if(!VOS_IS_STATUS_SUCCESS( status ))
{
- VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_ERROR,"%s: Could not return VOS packet to the pool", __FUNCTION__);
+ VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_ERROR,"%s: Could not return VOS packet to the pool", __func__);
}
return status;
@@ -816,7 +816,7 @@
( NULL == ppVosPacket ) ||
( NULL == pPktMetaInfo ) )
{
- VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_ERROR,"%s: Null Params being passed", __FUNCTION__);
+ VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_ERROR,"%s: Null Params being passed", __func__);
return VOS_STATUS_E_FAILURE;
}
@@ -824,7 +824,7 @@
pHddCtx = (hdd_context_t *)vos_get_context( VOS_MODULE_ID_HDD, vosContext );
if ( NULL == pHddCtx )
{
- VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_ERROR,"%s: HDD adapter context is Null", __FUNCTION__);
+ VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_ERROR,"%s: HDD adapter context is Null", __func__);
return VOS_STATUS_E_FAILURE;
}
@@ -841,14 +841,14 @@
if (STAId >= WLAN_MAX_STA_COUNT)
{
VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_ERROR,
- "%s: Invalid STAId %d passed by TL", __FUNCTION__, STAId);
+ "%s: Invalid STAId %d passed by TL", __func__, STAId);
return VOS_STATUS_E_FAILURE;
}
if (FALSE == pAdapter->aStaInfo[STAId].isUsed )
{
VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_ERROR,
- "%s: Unregistered STAId %d passed by TL", __FUNCTION__, STAId);
+ "%s: Unregistered STAId %d passed by TL", __func__, STAId);
return VOS_STATUS_E_FAILURE;
}
@@ -858,14 +858,14 @@
if( ac > WLANTL_MAX_AC || ac < 0)
{
VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_ERROR,
- "%s: Invalid AC %d passed by TL", __FUNCTION__, ac);
+ "%s: Invalid AC %d passed by TL", __func__, ac);
return VOS_STATUS_E_FAILURE;
}
++pAdapter->hdd_stats.hddTxRxStats.txFetchedAC[ac];
VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_INFO,
- "%s: AC %d passed by TL", __FUNCTION__, ac);
+ "%s: AC %d passed by TL", __func__, ac);
//Get the vos packet. I don't want to dequeue and enqueue again if we are out of VOS resources
//This simplifies the locking and unlocking of Tx queue
@@ -881,7 +881,7 @@
pAdapter->isVosOutOfResource = VOS_TRUE;
++pAdapter->hdd_stats.hddTxRxStats.txFetchLowResources;
VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_ERROR,
- "%s: VOSS in Low Resource scenario", __FUNCTION__);
+ "%s: VOSS in Low Resource scenario", __func__);
//TL needs to handle this case. VOS_STATUS_E_EMPTY is returned when the queue is empty.
return VOS_STATUS_E_FAILURE;
}
@@ -903,7 +903,7 @@
spin_unlock_bh(&pAdapter->aStaInfo[STAId].wmm_tx_queue[ac].lock);
VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_INFO,
- "%s: AC %d has packets pending", __FUNCTION__, ac);
+ "%s: AC %d has packets pending", __func__, ac);
if(VOS_STATUS_SUCCESS == status)
{
@@ -916,7 +916,7 @@
++pAdapter->hdd_stats.hddTxRxStats.txFetchDequeueError;
VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_ERROR,
"%s: Error in de-queuing skb from Tx queue status = %d",
- __FUNCTION__, status );
+ __func__, status );
vos_pkt_return_packet(pVosPacket);
return VOS_STATUS_E_FAILURE;
}
@@ -926,7 +926,7 @@
if (status != VOS_STATUS_SUCCESS)
{
VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_ERROR,
- "%s: Error attaching skb", __FUNCTION__);
+ "%s: Error attaching skb", __func__);
vos_pkt_return_packet(pVosPacket);
++pAdapter->stats.tx_dropped;
++pAdapter->hdd_stats.hddTxRxStats.txFetchDequeueError;
@@ -938,7 +938,7 @@
if(pVosPacket == NULL)
{
VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS packet returned by VOSS is NULL", __FUNCTION__);
+ "%s: VOS packet returned by VOSS is NULL", __func__);
++pAdapter->stats.tx_dropped;
++pAdapter->hdd_stats.hddTxRxStats.txFetchDequeueError;
kfree_skb(skb);
@@ -968,7 +968,7 @@
if (TRUE == hdd_IsEAPOLPacket( pVosPacket ))
{
VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_INFO_HIGH,
- "%s: VOS packet is EAPOL packet", __FUNCTION__);
+ "%s: VOS packet is EAPOL packet", __func__);
pPktMetaInfo->ucIsEapol = 1;
}
}
@@ -1008,7 +1008,7 @@
(size <= ((pAdapter->aTxQueueLimit[ac]*3)/4) ))
{
VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_INFO,
- "%s: TX queue re-enabled", __FUNCTION__);
+ "%s: TX queue re-enabled", __func__);
pAdapter->aStaInfo[STAId].txSuspended[ac] = VOS_FALSE;
netif_wake_subqueue(pAdapter->dev, skb_get_queue_mapping(skb));
}
@@ -1028,7 +1028,7 @@
++pAdapter->hdd_stats.hddTxRxStats.txFetchDequeuedAC[ac];
VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_INFO,
- "%s: Valid VOS PKT returned to TL", __FUNCTION__);
+ "%s: Valid VOS PKT returned to TL", __func__);
return status;
}
@@ -1057,7 +1057,7 @@
if(pAdapter == NULL)
{
- VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_ERROR,"%s: HDD adapter context is Null", __FUNCTION__);
+ VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_ERROR,"%s: HDD adapter context is Null", __func__);
return VOS_STATUS_E_FAILURE;
}
@@ -1087,7 +1087,7 @@
(WLANTL_ACEnumType)i );
if( !VOS_IS_STATUS_SUCCESS( status ) )
{
- VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_ERROR,"%s: Failure in indicating pkt to TL for ac=%d", __FUNCTION__,i);
+ VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_ERROR,"%s: Failure in indicating pkt to TL for ac=%d", __func__,i);
}
}
}
@@ -1128,14 +1128,14 @@
( NULL == pVosPacketChain ) ||
( NULL == pRxMetaInfo ) )
{
- VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_ERROR,"%s: Null params being passed", __FUNCTION__);
+ VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_ERROR,"%s: Null params being passed", __func__);
return VOS_STATUS_E_FAILURE;
}
pHddCtx = (hdd_context_t *)vos_get_context( VOS_MODULE_ID_HDD, vosContext );
if ( NULL == pHddCtx )
{
- VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_ERROR,"%s: HDD adapter context is Null", __FUNCTION__);
+ VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_ERROR,"%s: HDD adapter context is Null", __func__);
return VOS_STATUS_E_FAILURE;
}
@@ -1160,7 +1160,7 @@
if (!((status == VOS_STATUS_SUCCESS) || (status == VOS_STATUS_E_EMPTY)))
{
++pAdapter->hdd_stats.hddTxRxStats.rxDropped;
- VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_ERROR,"%s: Failure walking packet chain", __FUNCTION__);
+ VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_ERROR,"%s: Failure walking packet chain", __func__);
return VOS_STATUS_E_FAILURE;
}
@@ -1170,7 +1170,7 @@
if(!VOS_IS_STATUS_SUCCESS( status ))
{
++pAdapter->hdd_stats.hddTxRxStats.rxDropped;
- VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_ERROR,"%s: Failure extracting skb from vos pkt", __FUNCTION__);
+ VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_ERROR,"%s: Failure extracting skb from vos pkt", __func__);
return VOS_STATUS_E_FAILURE;
}
@@ -1206,7 +1206,7 @@
else
{
VOS_TRACE(VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_ERROR,
- "%s: skb allocation fails", __FUNCTION__);
+ "%s: skb allocation fails", __func__);
}
@@ -1216,7 +1216,7 @@
(WLAN_RX_SAP_SELF_STA_ID == pRxMetaInfo->ucDesSTAId))
{
VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_INFO_LOW,
- "%s: send one packet to kernel \n", __FUNCTION__);
+ "%s: send one packet to kernel \n", __func__);
skb->protocol = eth_type_trans(skb, skb->dev);
skb->ip_summed = CHECKSUM_NONE;
@@ -1253,7 +1253,7 @@
status = vos_pkt_return_packet( pVosPacketChain );
if(!VOS_IS_STATUS_SUCCESS( status ))
{
- VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_ERROR,"%s: Failure returning vos pkt", __FUNCTION__);
+ VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_ERROR,"%s: Failure returning vos pkt", __func__);
}
pAdapter->dev->last_rx = jiffies;
@@ -1503,7 +1503,7 @@
if (!VOS_IS_STATUS_SUCCESS(vosStatus))
{
VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_ERROR,
- "%s: Failed to deregister BC sta Id %d", __FUNCTION__, (WLAN_HDD_GET_AP_CTX_PTR(pAdapter))->uBCStaId);
+ "%s: Failed to deregister BC sta Id %d", __func__, (WLAN_HDD_GET_AP_CTX_PTR(pAdapter))->uBCStaId);
}
for (staId = 0; staId < WLAN_MAX_STA_COUNT; staId++)
@@ -1514,7 +1514,7 @@
if (!VOS_IS_STATUS_SUCCESS(vosStatus))
{
VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_ERROR,
- "%s: Failed to deregister sta Id %d", __FUNCTION__, staId);
+ "%s: Failed to deregister sta Id %d", __func__, staId);
}
}
@@ -1531,7 +1531,7 @@
#endif //FEATURE_WLAN_NON_INTEGRATED_SOC
VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_INFO,
- "%s: enter", __FUNCTION__);
+ "%s: enter", __func__);
#ifdef FEATURE_WLAN_NON_INTEGRATED_SOC
if(!hHalHandle )
@@ -1545,14 +1545,14 @@
if (eHAL_STATUS_SUCCESS != halTable_FindStaidByAddr(hHalHandle, (tANI_U8 *)pDestMacAddress, &ucSTAId))
{
VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_ERROR,
- "%s: Failed to find right station", __FUNCTION__);
+ "%s: Failed to find right station", __func__);
return VOS_STATUS_E_FAILURE;
}
#else
if (VOS_STATUS_SUCCESS != hdd_softap_GetStaId(pAdapter, pDestMacAddress, &ucSTAId))
{
VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_ERROR,
- "%s: Failed to find right station", __FUNCTION__);
+ "%s: Failed to find right station", __func__);
return VOS_STATUS_E_FAILURE;
}
#endif //FEATURE_WLAN_NON_INTEGRATED_SOC
@@ -1560,13 +1560,13 @@
if (FALSE == vos_is_macaddr_equal(&pAdapter->aStaInfo[ucSTAId].macAddrSTA, pDestMacAddress))
{
VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_ERROR,
- "%s: Station MAC address does not matching", __FUNCTION__);
+ "%s: Station MAC address does not matching", __func__);
return VOS_STATUS_E_FAILURE;
}
vosStatus = WLANTL_ChangeSTAState( pVosContext, ucSTAId, state );
VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_INFO,
- "%s: change station to state %d succeed", __FUNCTION__, state);
+ "%s: change station to state %d succeed", __func__, state);
if (VOS_STATUS_SUCCESS == vosStatus)
{
@@ -1574,7 +1574,7 @@
}
VOS_TRACE(VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_INFO,
- "%s exit\n",__FUNCTION__);
+ "%s exit\n",__func__);
return vosStatus;
}
diff --git a/CORE/HDD/src/wlan_hdd_tx_rx.c b/CORE/HDD/src/wlan_hdd_tx_rx.c
index b4a1c7d..89f881b 100644
--- a/CORE/HDD/src/wlan_hdd_tx_rx.c
+++ b/CORE/HDD/src/wlan_hdd_tx_rx.c
@@ -84,13 +84,13 @@
//Utility function to dump an sk_buff
static void dump_sk_buff(struct sk_buff * skb)
{
- VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,"%s: head = %p ", __FUNCTION__, skb->head);
- VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,"%s: data = %p ", __FUNCTION__, skb->data);
- VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,"%s: tail = %p ", __FUNCTION__, skb->tail);
- VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,"%s: end = %p ", __FUNCTION__, skb->end);
- VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,"%s: len = %d ", __FUNCTION__, skb->len);
- VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,"%s: data_len = %d ", __FUNCTION__, skb->data_len);
- VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,"%s: mac_len = %d\n", __FUNCTION__, skb->mac_len);
+ VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,"%s: head = %p ", __func__, skb->head);
+ VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,"%s: data = %p ", __func__, skb->data);
+ VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,"%s: tail = %p ", __func__, skb->tail);
+ VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,"%s: end = %p ", __func__, skb->end);
+ VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,"%s: len = %d ", __func__, skb->len);
+ VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,"%s: data_len = %d ", __func__, skb->data_len);
+ VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,"%s: mac_len = %d\n", __func__, skb->mac_len);
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,"0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x ",
skb->data[0], skb->data[1], skb->data[2], skb->data[3], skb->data[4],
@@ -117,30 +117,30 @@
&pVosPacket,
&pktMetaInfo );
if (status != VOS_STATUS_SUCCESS && status != VOS_STATUS_E_EMPTY)
- VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,"%s: Test FAIL hdd_tx_fetch_packet_cbk", __FUNCTION__);
+ VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,"%s: Test FAIL hdd_tx_fetch_packet_cbk", __func__);
else
- VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,"%s: Test PASS hdd_tx_fetch_packet_cbk", __FUNCTION__);
+ VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,"%s: Test PASS hdd_tx_fetch_packet_cbk", __func__);
status = hdd_tx_complete_cbk(pAdapter->pvosContext, &dummyPacket, VOS_STATUS_SUCCESS);
if (status != VOS_STATUS_SUCCESS)
- VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,"%s: Test FAIL hdd_tx_complete_cbk", __FUNCTION__);
+ VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,"%s: Test FAIL hdd_tx_complete_cbk", __func__);
else
- VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,"%s: Test PASS hdd_tx_complete_cbk", __FUNCTION__);
+ VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,"%s: Test PASS hdd_tx_complete_cbk", __func__);
status = hdd_tx_low_resource_cbk(pVosPacket, pAdapter);
if (status != VOS_STATUS_SUCCESS)
- VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,"%s: Test FAIL hdd_tx_low_resource_cbk", __FUNCTION__);
+ VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,"%s: Test FAIL hdd_tx_low_resource_cbk", __func__);
else
- VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,"%s: Test PASS hdd_tx_low_resource_cbk", __FUNCTION__);
+ VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,"%s: Test PASS hdd_tx_low_resource_cbk", __func__);
status = hdd_rx_packet_cbk( pAdapter->pvosContext,
&dummyPacket,
staId,
&pktRxMetaInfo);
if (status != VOS_STATUS_SUCCESS)
- VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,"%s: Test FAIL hdd_rx_packet_cbk", __FUNCTION__);
+ VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,"%s: Test FAIL hdd_rx_packet_cbk", __func__);
else
- VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,"%s: Test PASS hdd_rx_packet_cbk", __FUNCTION__);
+ VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,"%s: Test PASS hdd_rx_packet_cbk", __func__);
}
#endif
@@ -210,7 +210,7 @@
if( size == 0 )
{
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
- "%s: NO Packet Pending", __FUNCTION__);
+ "%s: NO Packet Pending", __func__);
return NULL;
}
@@ -229,7 +229,7 @@
{
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
"%s: Not able to remove Packet from the list",
- __FUNCTION__);
+ __func__);
return NULL;
}
@@ -239,7 +239,7 @@
(size <= HDD_TX_QUEUE_LOW_WATER_MARK) )
{
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_WARN,
- "%s: TX queue[%d] re-enabled", __FUNCTION__, ac);
+ "%s: TX queue[%d] re-enabled", __func__, ac);
pAdapter->isTxSuspended[ac] = VOS_FALSE;
/* Enable Queues which we have disabled earlier */
netif_tx_start_all_queues( pAdapter->dev );
@@ -474,7 +474,7 @@
if ( !VOS_IS_STATUS_SUCCESS( status ) )
{
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
- "%s:Insert Tx queue failed. Pkt dropped", __FUNCTION__);
+ "%s:Insert Tx queue failed. Pkt dropped", __func__);
kfree_skb(skb);
return NETDEV_TX_OK;
}
@@ -539,7 +539,7 @@
#ifdef HDD_WMM_DEBUG
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_FATAL,
- "%s: Classified as ac %d up %d", __FUNCTION__, ac, up);
+ "%s: Classified as ac %d up %d", __func__, ac, up);
#endif // HDD_WMM_DEBUG
spin_lock(&pAdapter->wmm_tx_queue[ac].lock);
@@ -548,7 +548,7 @@
* occurs very frequently in low traffic cases */
if((pAdapter->wmm_tx_queue[ac].count + 1) % 10 == 0)
{
- VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,"%s:Queue is Filling up.Inform TL again about pending packets", __FUNCTION__);
+ VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,"%s:Queue is Filling up.Inform TL again about pending packets", __func__);
WLANTL_STAPktPending( (WLAN_HDD_GET_CTX(pAdapter))->pvosContext, pHddStaCtx->conn_info.staId[0], ac );
}
//If we have already reached the max queue size, disable the TX queue
@@ -567,7 +567,7 @@
{
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_WARN,
"%s: TX queue full for AC=%d Disable OS TX queue",
- __FUNCTION__, ac );
+ __func__, ac );
return NETDEV_TX_BUSY;
}
@@ -590,7 +590,7 @@
if ( !VOS_IS_STATUS_SUCCESS( status ) )
{
- VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_WARN,"%s:Insert Tx queue failed. Pkt dropped", __FUNCTION__);
+ VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_WARN,"%s:Insert Tx queue failed. Pkt dropped", __func__);
++pAdapter->hdd_stats.hddTxRxStats.txXmitDropped;
++pAdapter->hdd_stats.hddTxRxStats.txXmitDroppedAC[ac];
++pAdapter->stats.tx_dropped;
@@ -615,12 +615,12 @@
if ( granted && ( pktListSize == 1 ))
{
//Let TL know we have a packet to send for this AC
- //VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,"%s:Indicating Packet to TL", __FUNCTION__);
+ //VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,"%s:Indicating Packet to TL", __func__);
status = WLANTL_STAPktPending( (WLAN_HDD_GET_CTX(pAdapter))->pvosContext, pHddStaCtx->conn_info.staId[0], ac );
if ( !VOS_IS_STATUS_SUCCESS( status ) )
{
- VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_WARN, "%s: Failed to signal TL for AC=%d", __FUNCTION__, ac );
+ VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_WARN, "%s: Failed to signal TL for AC=%d", __func__, ac );
//Remove the packet from queue. It must be at the back of the queue, as TX thread cannot preempt us in the middle
//as we are in a soft irq context. Also it must be the same packet that we just allocated.
@@ -651,7 +651,7 @@
void hdd_tx_timeout(struct net_device *dev)
{
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
- "%s: Transmission timeout occurred", __FUNCTION__);
+ "%s: Transmission timeout occurred", __func__);
//Getting here implies we disabled the TX queues for too long. Queues are
//disabled either because of disassociation or low resource scenarios. In
//case of disassociation it is ok to ignore this. But if associated, we have
@@ -827,7 +827,7 @@
if( ( NULL == vosContext ) || ( NULL == pVosPacket ) )
{
- VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,"%s: Null params being passed", __FUNCTION__);
+ VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,"%s: Null params being passed", __func__);
return VOS_STATUS_E_FAILURE;
}
@@ -836,7 +836,7 @@
if(!VOS_IS_STATUS_SUCCESS( status ))
{
//This is bad but still try to free the VOSS resources if we can
- VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,"%s: Failure extracting skb from vos pkt", __FUNCTION__);
+ VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,"%s: Failure extracting skb from vos pkt", __func__);
vos_pkt_return_packet( pVosPacket );
return VOS_STATUS_E_FAILURE;
}
@@ -847,7 +847,7 @@
pAdapter = hdd_get_adapter(pHddCtx,WLAN_HDD_INFRA_STATION);
if(pAdapter == NULL)
{
- VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,"%s: HDD adapter context is Null", __FUNCTION__);
+ VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,"%s: HDD adapter context is Null", __func__);
}
else
{
@@ -860,7 +860,7 @@
status = vos_pkt_return_packet( pVosPacket );
if(!VOS_IS_STATUS_SUCCESS( status ))
{
- VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,"%s: Could not return VOS packet to the pool", __FUNCTION__);
+ VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,"%s: Could not return VOS packet to the pool", __func__);
}
return status;
@@ -906,7 +906,7 @@
( NULL == ppVosPacket ) ||
( NULL == pPktMetaInfo ) )
{
- VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,"%s: Null Params being passed", __FUNCTION__);
+ VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,"%s: Null Params being passed", __func__);
return VOS_STATUS_E_FAILURE;
}
@@ -914,7 +914,7 @@
pHddCtx = (hdd_context_t *)vos_get_context( VOS_MODULE_ID_HDD, vosContext );
if(pHddCtx == NULL)
{
- VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,"%s: HDD adapter context is Null", __FUNCTION__);
+ VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,"%s: HDD adapter context is Null", __func__);
return VOS_STATUS_E_FAILURE;
}
@@ -932,14 +932,14 @@
//Make sure the AC being asked for is sane
if( ac >= WLANTL_MAX_AC || ac < 0)
{
- VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,"%s: Invalid AC %d passed by TL", __FUNCTION__, ac);
+ VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,"%s: Invalid AC %d passed by TL", __func__, ac);
return VOS_STATUS_E_FAILURE;
}
++pAdapter->hdd_stats.hddTxRxStats.txFetchedAC[ac];
#ifdef HDD_WMM_DEBUG
- VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_FATAL,"%s: AC %d passed by TL", __FUNCTION__, ac);
+ VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_FATAL,"%s: AC %d passed by TL", __func__, ac);
#endif // HDD_WMM_DEBUG
// We find an AC with packets
@@ -954,7 +954,7 @@
++pAdapter->hdd_stats.hddTxRxStats.txFetchEmpty;
#ifdef HDD_WMM_DEBUG
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_FATAL,
- "%s: no packets pending", __FUNCTION__);
+ "%s: no packets pending", __func__);
#endif // HDD_WMM_DEBUG
return VOS_STATUS_E_FAILURE;
}
@@ -966,7 +966,7 @@
// yes, so process it
#ifdef HDD_WMM_DEBUG
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_FATAL,
- "%s: AC %d has packets pending", __FUNCTION__, ac);
+ "%s: AC %d has packets pending", __func__, ac);
#endif // HDD_WMM_DEBUG
}
else
@@ -974,7 +974,7 @@
++pAdapter->hdd_stats.hddTxRxStats.txFetchEmpty;
#ifdef HDD_WMM_DEBUG
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_FATAL,
- "%s: no packets pending", __FUNCTION__);
+ "%s: no packets pending", __func__);
#endif // HDD_WMM_DEBUG
return VOS_STATUS_E_FAILURE;
}
@@ -992,7 +992,7 @@
//Remember VOS is in a low resource situation
pAdapter->isVosOutOfResource = VOS_TRUE;
++pAdapter->hdd_stats.hddTxRxStats.txFetchLowResources;
- VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_WARN,"%s: VOSS in Low Resource scenario", __FUNCTION__);
+ VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_WARN,"%s: VOSS in Low Resource scenario", __func__);
//TL will now think we have no more packets in this AC
return VOS_STATUS_E_FAILURE;
}
@@ -1012,7 +1012,7 @@
{
++pAdapter->hdd_stats.hddTxRxStats.txFetchDequeueError;
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_WARN, "%s: Error in de-queuing "
- "skb from Tx queue status = %d", __FUNCTION__, status );
+ "skb from Tx queue status = %d", __func__, status );
vos_pkt_return_packet(pVosPacket);
return VOS_STATUS_E_FAILURE;
}
@@ -1021,7 +1021,7 @@
status = vos_pkt_set_os_packet( pVosPacket, skb );
if (status != VOS_STATUS_SUCCESS)
{
- VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_WARN,"%s: Error attaching skb", __FUNCTION__);
+ VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_WARN,"%s: Error attaching skb", __func__);
vos_pkt_return_packet(pVosPacket);
++pAdapter->stats.tx_dropped;
++pAdapter->hdd_stats.hddTxRxStats.txFetchDequeueError;
@@ -1032,7 +1032,7 @@
//Just being paranoid. To be removed later
if(pVosPacket == NULL)
{
- VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_WARN,"%s: VOS packet returned by VOSS is NULL", __FUNCTION__);
+ VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_WARN,"%s: VOS packet returned by VOSS is NULL", __func__);
++pAdapter->stats.tx_dropped;
++pAdapter->hdd_stats.hddTxRxStats.txFetchDequeueError;
kfree_skb(skb);
@@ -1119,7 +1119,7 @@
++pAdapter->hdd_stats.hddTxRxStats.txFetchDePressured;
++pAdapter->hdd_stats.hddTxRxStats.txFetchDePressuredAC[ac];
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_WARN,
- "%s: TX queue[%d] re-enabled", __FUNCTION__, ac);
+ "%s: TX queue[%d] re-enabled", __func__, ac);
pAdapter->isTxSuspended[ac] = VOS_FALSE;
netif_tx_wake_queue(netdev_get_tx_queue(pAdapter->dev,
skb_get_queue_mapping(skb) ));
@@ -1145,7 +1145,7 @@
if(mutex_lock_interruptible(&pHddCtx->tmInfo.tmOperationLock))
{
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
- "%s: Tm Lock fail", __FUNCTION__);
+ "%s: Tm Lock fail", __func__);
return VOS_STATUS_E_FAILURE;
}
if(WLAN_HDD_TM_LEVEL_1 < pHddCtx->tmInfo.currentTmLevel)
@@ -1189,7 +1189,7 @@
#ifdef HDD_WMM_DEBUG
- VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_FATAL,"%s: Valid VOS PKT returned to TL", __FUNCTION__);
+ VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_FATAL,"%s: Valid VOS PKT returned to TL", __func__);
#endif // HDD_WMM_DEBUG
return status;
@@ -1218,7 +1218,7 @@
if(pAdapter == NULL)
{
- VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,"%s: HDD adapter context is Null", __FUNCTION__);
+ VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,"%s: HDD adapter context is Null", __func__);
return VOS_STATUS_E_FAILURE;
}
@@ -1241,7 +1241,7 @@
(WLANTL_ACEnumType)i );
if( !VOS_IS_STATUS_SUCCESS( status ) )
{
- VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,"%s: Failure in indicating pkt to TL for ac=%d", __FUNCTION__,i);
+ VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,"%s: Failure in indicating pkt to TL for ac=%d", __func__,i);
}
}
}
@@ -1281,14 +1281,14 @@
( NULL == pVosPacketChain ) ||
( NULL == pRxMetaInfo ) )
{
- VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,"%s: Null params being passed", __FUNCTION__);
+ VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,"%s: Null params being passed", __func__);
return VOS_STATUS_E_FAILURE;
}
pHddCtx = (hdd_context_t *)vos_get_context( VOS_MODULE_ID_HDD, vosContext );
if ( NULL == pHddCtx )
{
- VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,"%s: HDD adapter context is Null", __FUNCTION__);
+ VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,"%s: HDD adapter context is Null", __func__);
return VOS_STATUS_E_FAILURE;
}
@@ -1313,7 +1313,7 @@
if (!((status == VOS_STATUS_SUCCESS) || (status == VOS_STATUS_E_EMPTY)))
{
++pAdapter->hdd_stats.hddTxRxStats.rxDropped;
- VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,"%s: Failure walking packet chain", __FUNCTION__);
+ VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,"%s: Failure walking packet chain", __func__);
return VOS_STATUS_E_FAILURE;
}
@@ -1323,7 +1323,7 @@
if(!VOS_IS_STATUS_SUCCESS( status ))
{
++pAdapter->hdd_stats.hddTxRxStats.rxDropped;
- VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,"%s: Failure extracting skb from vos pkt", __FUNCTION__);
+ VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,"%s: Failure extracting skb from vos pkt", __func__);
return VOS_STATUS_E_FAILURE;
}
@@ -1361,7 +1361,7 @@
status = vos_pkt_return_packet( pVosPacketChain );
if(!VOS_IS_STATUS_SUCCESS( status ))
{
- VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,"%s: Failure returning vos pkt", __FUNCTION__);
+ VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,"%s: Failure returning vos pkt", __func__);
}
pAdapter->dev->last_rx = jiffies;
diff --git a/CORE/HDD/src/wlan_hdd_wext.c b/CORE/HDD/src/wlan_hdd_wext.c
index b3e2482..ac752e1 100644
--- a/CORE/HDD/src/wlan_hdd_wext.c
+++ b/CORE/HDD/src/wlan_hdd_wext.c
@@ -498,12 +498,12 @@
break;
default:
hddLog(LOGE, FL("%s called with unknown authType - default to Open, None\n"),
- __FUNCTION__);
+ __func__);
rsnType = eANI_BOOLEAN_FALSE;
break;
}
hddLog(LOGE, FL("%s called with authType: %d, returned: %d\n"),
- __FUNCTION__, authType, rsnType);
+ __func__, authType, rsnType);
return rsnType;
}
@@ -515,14 +515,14 @@
if (ioctl_debug)
{
pr_info("%s: rssi [%d] STA [%d] pContext [%p]\n",
- __FUNCTION__, (int)rssi, (int)staId, pContext);
+ __func__, (int)rssi, (int)staId, pContext);
}
if (NULL == pContext)
{
hddLog(VOS_TRACE_LEVEL_ERROR,
"%s: Bad param, pContext [%p]",
- __FUNCTION__, pContext);
+ __func__, pContext);
return;
}
@@ -538,11 +538,11 @@
/* the caller presumably timed out so there is nothing we can do */
hddLog(VOS_TRACE_LEVEL_WARN,
"%s: Invalid context, pAdapter [%p] magic [%08x]",
- __FUNCTION__, pAdapter, pStatsContext->magic);
+ __func__, pAdapter, pStatsContext->magic);
if (ioctl_debug)
{
pr_info("%s: Invalid context, pAdapter [%p] magic [%08x]\n",
- __FUNCTION__, pAdapter, pStatsContext->magic);
+ __func__, pAdapter, pStatsContext->magic);
}
return;
}
@@ -592,7 +592,7 @@
if (eHAL_STATUS_SUCCESS != hstatus)
{
hddLog(VOS_TRACE_LEVEL_ERROR,"%s: Unable to retrieve RSSI",
- __FUNCTION__);
+ __func__);
/* we'll returned a cached value below */
}
else
@@ -606,7 +606,7 @@
if (lrc <= 0)
{
hddLog(VOS_TRACE_LEVEL_ERROR,"%s: SME %s while retrieving RSSI ",
- __FUNCTION__, (0 == lrc) ? "timeout" : "interrupt");
+ __func__, (0 == lrc) ? "timeout" : "interrupt");
/* there is a race condition such that the callback
function could be executing at the same time we are. of
primary concern is if the callback function had already
@@ -668,7 +668,7 @@
if (!VOS_IS_STATUS_SUCCESS(vos_status))
{
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
- "%s: vos_event_set failed", __FUNCTION__);
+ "%s: vos_event_set failed", __func__);
return;
}
}
@@ -692,7 +692,7 @@
pHddCtx = (hdd_context_t*) vos_get_context(VOS_MODULE_ID_HDD,pVosContext);
if (NULL == pHddCtx)
{
- hddLog(VOS_TRACE_LEVEL_ERROR, "%s: Invalid pHddCtx", __FUNCTION__);
+ hddLog(VOS_TRACE_LEVEL_ERROR, "%s: Invalid pHddCtx", __func__);
return;
}
#if 0
@@ -844,7 +844,7 @@
static int iw_set_commit(struct net_device *dev, struct iw_request_info *info,
union iwreq_data *wrqu, char *extra)
{
- hddLog( LOG1, "In %s\n", __FUNCTION__);
+ hddLog( LOG1, "In %s\n", __func__);
/* Do nothing for now */
return 0;
}
@@ -891,7 +891,7 @@
pWextState = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter);
if (pWextState == NULL)
{
- hddLog (LOGE, "%s ERROR: Data Storage Corruption", __FUNCTION__);
+ hddLog (LOGE, "%s ERROR: Data Storage Corruption", __func__);
return -EINVAL;
}
@@ -901,12 +901,12 @@
pRoamProfile = &pWextState->roamProfile;
LastBSSType = pRoamProfile->BSSType;
- hddLog( LOG1,"%s Old Bss type = %d", __FUNCTION__, LastBSSType);
+ hddLog( LOG1,"%s Old Bss type = %d", __func__, LastBSSType);
switch (wrqu->mode)
{
case IW_MODE_ADHOC:
- hddLog( LOG1,"%s Setting AP Mode as IW_MODE_ADHOC", __FUNCTION__);
+ hddLog( LOG1,"%s Setting AP Mode as IW_MODE_ADHOC", __func__);
pRoamProfile->BSSType = eCSR_BSS_TYPE_START_IBSS;
// Set the phymode correctly for IBSS.
pConfig = (WLAN_HDD_GET_CTX(pAdapter))->cfg_ini;
@@ -916,18 +916,18 @@
#endif
break;
case IW_MODE_INFRA:
- hddLog( LOG1, "%s Setting AP Mode as IW_MODE_INFRA", __FUNCTION__);
+ hddLog( LOG1, "%s Setting AP Mode as IW_MODE_INFRA", __func__);
pRoamProfile->BSSType = eCSR_BSS_TYPE_INFRASTRUCTURE;
#ifdef CONFIG_CFG80211
wdev->iftype = NL80211_IFTYPE_STATION;
#endif
break;
case IW_MODE_AUTO:
- hddLog(LOG1,"%s Setting AP Mode as IW_MODE_AUTO", __FUNCTION__);
+ hddLog(LOG1,"%s Setting AP Mode as IW_MODE_AUTO", __func__);
pRoamProfile->BSSType = eCSR_BSS_TYPE_ANY;
break;
default:
- hddLog(LOG1,"%s Unknown AP Mode value", __FUNCTION__);
+ hddLog(LOG1,"%s Unknown AP Mode value", __func__);
return -EOPNOTSUPP;
}
@@ -965,7 +965,7 @@
hdd_wext_state_t *pWextState;
hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev);
- hddLog (LOG1, "In %s",__FUNCTION__);
+ hddLog (LOG1, "In %s",__func__);
if (NULL == pAdapter)
{
@@ -982,27 +982,27 @@
pWextState = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter);
if (pWextState == NULL)
{
- hddLog (LOGE, "%s ERROR: Data Storage Corruption", __FUNCTION__);
+ hddLog (LOGE, "%s ERROR: Data Storage Corruption", __func__);
return -EINVAL;
}
switch (pWextState->roamProfile.BSSType)
{
case eCSR_BSS_TYPE_INFRASTRUCTURE:
- hddLog(LOG1, "%s returns IW_MODE_INFRA\n", __FUNCTION__);
+ hddLog(LOG1, "%s returns IW_MODE_INFRA\n", __func__);
*uwrq = IW_MODE_INFRA ;
break;
case eCSR_BSS_TYPE_IBSS:
case eCSR_BSS_TYPE_START_IBSS:
- hddLog( LOG1,"%s returns IW_MODE_ADHOC\n", __FUNCTION__);
+ hddLog( LOG1,"%s returns IW_MODE_ADHOC\n", __func__);
*uwrq= IW_MODE_ADHOC;
break;
case eCSR_BSS_TYPE_ANY:
- hddLog( LOG1,"%s returns IW_MODE_AUTO\n", __FUNCTION__);
+ hddLog( LOG1,"%s returns IW_MODE_AUTO\n", __func__);
*uwrq= IW_MODE_AUTO;
break;
default:
- hddLog( LOG1,"%s returns APMODE_UNKNOWN\n", __FUNCTION__);
+ hddLog( LOG1,"%s returns APMODE_UNKNOWN\n", __func__);
break;
}
return 0;
@@ -1065,7 +1065,7 @@
(wrqu->freq.m > WNI_CFG_CURRENT_CHANNEL_STAMAX))
{
hddLog(LOG1,"%s: Channel [%d] is outside valid range from %d to %d\n",
- __FUNCTION__, wrqu->freq.m, WNI_CFG_CURRENT_CHANNEL_STAMIN,
+ __func__, wrqu->freq.m, WNI_CFG_CURRENT_CHANNEL_STAMIN,
WNI_CFG_CURRENT_CHANNEL_STAMAX);
return -EINVAL;
}
@@ -1244,7 +1244,7 @@
{
hddLog(VOS_TRACE_LEVEL_ERROR,
"%s: Unable to retrieve statistics",
- __FUNCTION__);
+ __func__);
return status;
}
@@ -1256,7 +1256,7 @@
{
hddLog(VOS_TRACE_LEVEL_ERROR,
"%s: SME timeout while retrieving statistics",
- __FUNCTION__);
+ __func__);
return VOS_STATUS_E_FAILURE;
}
@@ -1435,7 +1435,7 @@
}
break;
case DOT11F_EID_RSN:
- hddLog (LOG1, "%s Set RSN IE (len %d)",__FUNCTION__, eLen+2);
+ hddLog (LOG1, "%s Set RSN IE (len %d)",__func__, eLen+2);
memset( pWextState->WPARSNIE, 0, MAX_WPA_RSN_IE_LEN );
memcpy( pWextState->WPARSNIE, genie - 2, (eLen + 2));
pWextState->roamProfile.pRSNReqIE = pWextState->WPARSNIE;
@@ -1443,7 +1443,7 @@
break;
default:
- hddLog (LOGE, "%s Set UNKNOWN IE %X",__FUNCTION__, elementId);
+ hddLog (LOGE, "%s Set UNKNOWN IE %X",__func__, elementId);
return 0;
}
genie += eLen;
@@ -1498,7 +1498,7 @@
vos_mem_copy( wrqu->data.pointer, (v_VOID_t*)genIeBytes, wrqu->data.length);
- hddLog(LOG1,"%s: RSN IE of %d bytes returned\n", __FUNCTION__, wrqu->data.length );
+ hddLog(LOG1,"%s: RSN IE of %d bytes returned\n", __func__, wrqu->data.length );
EXIT();
@@ -1527,7 +1527,7 @@
if(keyId < 0 || keyId >= MAX_WEP_KEYS)
{
- hddLog(LOG1,"%s: Invalid keyId : %d\n",__FUNCTION__,keyId);
+ hddLog(LOG1,"%s: Invalid keyId : %d\n",__func__,keyId);
return -EINVAL;
}
@@ -1822,7 +1822,7 @@
{
hddLog(VOS_TRACE_LEVEL_ERROR,
"%s: Bad param, pContext [%p]",
- __FUNCTION__, pContext);
+ __func__, pContext);
return;
}
@@ -1839,12 +1839,12 @@
/* the caller presumably timed out so there is nothing we can do */
hddLog(VOS_TRACE_LEVEL_WARN,
"%s: Invalid context, pAdapter [%p] magic [%08x]",
- __FUNCTION__, pAdapter, pStatsContext->magic);
+ __func__, pAdapter, pStatsContext->magic);
if (ioctl_debug)
{
pr_info("%s: Invalid context, pAdapter [%p] magic [%08x]\n",
- __FUNCTION__, pAdapter, pStatsContext->magic);
+ __func__, pAdapter, pStatsContext->magic);
}
return;
}
@@ -1879,14 +1879,14 @@
if (ioctl_debug)
{
pr_info("%s: pStats [%p] pContext [%p]\n",
- __FUNCTION__, pStats, pContext);
+ __func__, pStats, pContext);
}
if ((NULL == pStats) || (NULL == pContext))
{
hddLog(VOS_TRACE_LEVEL_ERROR,
"%s: Bad param, pStats [%p] pContext [%p]",
- __FUNCTION__, pStats, pContext);
+ __func__, pStats, pContext);
return;
}
@@ -1903,11 +1903,11 @@
/* the caller presumably timed out so there is nothing we can do */
hddLog(VOS_TRACE_LEVEL_WARN,
"%s: Invalid context, pAdapter [%p] magic [%08x]",
- __FUNCTION__, pAdapter, pStatsContext->magic);
+ __func__, pAdapter, pStatsContext->magic);
if (ioctl_debug)
{
pr_info("%s: Invalid context, pAdapter [%p] magic [%08x]\n",
- __FUNCTION__, pAdapter, pStatsContext->magic);
+ __func__, pAdapter, pStatsContext->magic);
}
return;
}
@@ -1957,7 +1957,7 @@
{
hddLog(VOS_TRACE_LEVEL_ERROR,
"%s: Unable to retrieve Class A statistics ",
- __FUNCTION__);
+ __func__);
/* we'll returned a cached value below */
}
else
@@ -1972,7 +1972,7 @@
{
hddLog(VOS_TRACE_LEVEL_ERROR,
"%s: SME %s while retrieving Class A statistics",
- __FUNCTION__, (0 == lrc) ? "timeout" : "interrupt");
+ __func__, (0 == lrc) ? "timeout" : "interrupt");
/* there is a race condition such that the callback
function could be executing at the same time we are. of
primary concern is if the callback function had already
@@ -1996,14 +1996,14 @@
if (ioctl_debug)
{
pr_info("%s: pStats [%p] pContext [%p]\n",
- __FUNCTION__, pStats, pContext);
+ __func__, pStats, pContext);
}
if ((NULL == pStats) || (NULL == pContext))
{
hddLog(VOS_TRACE_LEVEL_ERROR,
"%s: Bad param, pStats [%p] pContext [%p]",
- __FUNCTION__, pStats, pContext);
+ __func__, pStats, pContext);
return;
}
@@ -2021,11 +2021,11 @@
/* the caller presumably timed out so there is nothing we can do */
hddLog(VOS_TRACE_LEVEL_WARN,
"%s: Invalid context, pAdapter [%p] magic [%08x]",
- __FUNCTION__, pAdapter, pStatsContext->magic);
+ __func__, pAdapter, pStatsContext->magic);
if (ioctl_debug)
{
pr_info("%s: Invalid context, pAdapter [%p] magic [%08x]\n",
- __FUNCTION__, pAdapter, pStatsContext->magic);
+ __func__, pAdapter, pStatsContext->magic);
}
return;
}
@@ -2073,7 +2073,7 @@
{
hddLog(VOS_TRACE_LEVEL_ERROR,
"%s: Unable to retrieve statistics",
- __FUNCTION__);
+ __func__);
/* we'll return with cached values */
}
else
@@ -2088,7 +2088,7 @@
{
hddLog(VOS_TRACE_LEVEL_ERROR,
"%s: SME %s while retrieving statistics",
- __FUNCTION__, (0 == lrc) ? "timeout" : "interrupt");
+ __func__, (0 == lrc) ? "timeout" : "interrupt");
/* there is a race condition such that the callback
function could be executing at the same time we are. of
primary concern is if the callback function had already
@@ -2140,7 +2140,7 @@
// encoding or length error?
hddLog(VOS_TRACE_LEVEL_ERROR,
"%s: Unable to encode link speed, got [%s]",
- __FUNCTION__,pLinkSpeed);
+ __func__,pLinkSpeed);
return -EIO;
}
@@ -2203,7 +2203,7 @@
// encoding or length error?
hddLog(VOS_TRACE_LEVEL_ERROR,
"%s: Unable to encode RSSI, got [%s]",
- __FUNCTION__, cmd);
+ __func__, cmd);
return -EIO;
}
@@ -2270,7 +2270,7 @@
if (lrc <= 0)
{
hddLog(VOS_TRACE_LEVEL_ERROR,"%s: SME %s while requesting fullpower ",
- __FUNCTION__, (0 == lrc) ? "timeout" : "interrupt");
+ __func__, (0 == lrc) ? "timeout" : "interrupt");
/* there is a race condition such that the callback
function could be executing at the same time we are. of
primary concern is if the callback function had already
@@ -2304,7 +2304,7 @@
if (lrc <= 0)
{
hddLog(VOS_TRACE_LEVEL_ERROR,"%s: SME %s while requesting BMPS ",
- __FUNCTION__, (0 == lrc) ? "timeout" : "interrupt");
+ __func__, (0 == lrc) ? "timeout" : "interrupt");
/* there is a race condition such that the callback
function could be executing at the same time we are. of
primary concern is if the callback function had already
@@ -2425,7 +2425,7 @@
if (ioctl_debug)
{
- pr_info("%s: req [%s] len [%d]\n", __FUNCTION__, cmd, cmd_len);
+ pr_info("%s: req [%s] len [%d]\n", __func__, cmd, cmd_len);
}
hddLog(VOS_TRACE_LEVEL_INFO_MED,
@@ -2434,7 +2434,7 @@
if (pHddCtx->isLogpInProgress) {
if (ioctl_debug)
{
- pr_info("%s: RESTART in progress\n", __FUNCTION__);
+ pr_info("%s: RESTART in progress\n", __func__);
}
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_FATAL,
@@ -2525,7 +2525,7 @@
if (lrc <= 0)
{
hddLog(VOS_TRACE_LEVEL_ERROR,"%s: SME %s while setting country code ",
- __FUNCTION__, "Timed out");
+ __func__, "Timed out");
}
if( 0 != status )
@@ -2673,7 +2673,7 @@
if (ioctl_debug)
{
pr_info("%s: rsp [%s] len [%d] status %d\n",
- __FUNCTION__, cmd, wrqu->data.length, status);
+ __func__, cmd, wrqu->data.length, status);
}
return status;
@@ -2788,7 +2788,7 @@
if(wrqu->data.length > 0)
{
- hddLog(VOS_TRACE_LEVEL_INFO, "%s : wrqu->data.length : %d",__FUNCTION__,wrqu->data.length);
+ hddLog(VOS_TRACE_LEVEL_INFO, "%s : wrqu->data.length : %d",__func__,wrqu->data.length);
key_length = wrqu->data.length;
@@ -2796,7 +2796,7 @@
if(5 == key_length)
{
- hddLog(VOS_TRACE_LEVEL_INFO, "%s: Call with WEP40,key_len=%d",__FUNCTION__,key_length);
+ hddLog(VOS_TRACE_LEVEL_INFO, "%s: Call with WEP40,key_len=%d",__func__,key_length);
if((IW_AUTH_KEY_MGMT_802_1X == pWextState->authKeyMgmt) && (eCSR_AUTH_TYPE_OPEN_SYSTEM == pHddStaCtx->conn_info.authType))
{
@@ -2809,7 +2809,7 @@
}
else if(13 == key_length)
{
- hddLog(VOS_TRACE_LEVEL_INFO, "%s:Call with WEP104,key_len:%d",__FUNCTION__,key_length);
+ hddLog(VOS_TRACE_LEVEL_INFO, "%s:Call with WEP104,key_len:%d",__func__,key_length);
if((IW_AUTH_KEY_MGMT_802_1X == pWextState->authKeyMgmt) && (eCSR_AUTH_TYPE_OPEN_SYSTEM == pHddStaCtx->conn_info.authType))
{
@@ -2823,7 +2823,7 @@
else
{
hddLog(VOS_TRACE_LEVEL_WARN, "%s: Invalid WEP key length :%d",
- __FUNCTION__, key_length);
+ __func__, key_length);
return -EINVAL;
}
@@ -2870,7 +2870,7 @@
if(keyId < 0 || keyId >= MAX_WEP_KEYS)
{
- hddLog(LOG1,"%s: Invalid keyId : %d\n",__FUNCTION__,keyId);
+ hddLog(LOG1,"%s: Invalid keyId : %d\n",__func__,keyId);
return -EINVAL;
}
@@ -2978,7 +2978,7 @@
{
if(IW_AUTH_KEY_MGMT_802_1X == pWextState->authKeyMgmt) {
- VOS_TRACE (VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,("Invalid Configuration:%s \n"),__FUNCTION__);
+ VOS_TRACE (VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,("Invalid Configuration:%s \n"),__func__);
return -EINVAL;
}
else {
@@ -3081,7 +3081,7 @@
}
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
- ("%s:cipher_alg:%d key_len[%d] *pEncryptionType :%d \n"),__FUNCTION__,(int)ext->alg,(int)ext->key_len,setKey.encType);
+ ("%s:cipher_alg:%d key_len[%d] *pEncryptionType :%d \n"),__func__,(int)ext->alg,(int)ext->key_len,setKey.encType);
#ifdef WLAN_FEATURE_VOWIFI_11R
/* The supplicant may attempt to set the PTK once pre-authentication is done.
@@ -3246,7 +3246,7 @@
msecs_to_jiffies(WLAN_WAIT_TIME_DISCONNECT));
else
hddLog(LOGE,"%s %d Command Disassociate/Deauthenticate : csrRoamDisconnect failure returned %d \n",
- __FUNCTION__, (int)mlme->cmd, (int)status );
+ __func__, (int)mlme->cmd, (int)status );
/* Resetting authKeyMgmt */
(WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter))->authKeyMgmt = 0;
@@ -3257,11 +3257,11 @@
}
else
{
- hddLog(LOGE,"%s %d Command Disassociate/Deauthenticate called but station is not in associated state \n", __FUNCTION__, (int)mlme->cmd );
+ hddLog(LOGE,"%s %d Command Disassociate/Deauthenticate called but station is not in associated state \n", __func__, (int)mlme->cmd );
}
break;
default:
- hddLog(LOGE,"%s %d Command should be Disassociate/Deauthenticate \n", __FUNCTION__, (int)mlme->cmd );
+ hddLog(LOGE,"%s %d Command should be Disassociate/Deauthenticate \n", __func__, (int)mlme->cmd );
return -EINVAL;
}//end of switch
@@ -3359,7 +3359,7 @@
{
hddLog(VOS_TRACE_LEVEL_ERROR,"%s: SME %s while "
"requesting fullpower ",
- __FUNCTION__, (0 == lrc) ?
+ __func__, (0 == lrc) ?
"timeout" : "interrupt");
/* there is a race condition such that the callback
function could be executing at the same time we are. of
@@ -3403,7 +3403,7 @@
{
hddLog(VOS_TRACE_LEVEL_ERROR,"%s: SME %s while "
"requesting BMPS",
- __FUNCTION__, (0 == lrc) ? "timeout" :
+ __func__, (0 == lrc) ? "timeout" :
"interrupt");
/* there is a race condition such that the callback
function could be executing at the same time we are. of
@@ -3564,7 +3564,7 @@
if(pAdapter->higherDtimTransition != set_value)
{
pAdapter->higherDtimTransition = set_value;
- hddLog(LOG1, "%s: higherDtimTransition set to :%d", __FUNCTION__, pAdapter->higherDtimTransition);
+ hddLog(LOG1, "%s: higherDtimTransition set to :%d", __func__, pAdapter->higherDtimTransition);
}
}
@@ -3604,8 +3604,8 @@
hdd_config_t *pConfig = pHddCtx->cfg_ini;
#endif /* WLAN_FEATURE_VOWIFI */
- VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, "%s: Received length %d", __FUNCTION__, wrqu->data.length);
- VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, "%s: Received data %s", __FUNCTION__, (char*)wrqu->data.pointer);
+ VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, "%s: Received length %d", __func__, wrqu->data.length);
+ VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, "%s: Received data %s", __func__, (char*)wrqu->data.pointer);
switch(sub_cmd)
{
@@ -3663,7 +3663,7 @@
break;
default:
{
- hddLog(LOGE, "%s: Invalid sub command %d\n",__FUNCTION__, sub_cmd);
+ hddLog(LOGE, "%s: Invalid sub command %d\n",__func__, sub_cmd);
ret = -EINVAL;
break;
}
@@ -3714,10 +3714,10 @@
}
case WE_MODULE_DOWN_IND:
{
- VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,"%s: sending WLAN_MODULE_DOWN_IND", __FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,"%s: sending WLAN_MODULE_DOWN_IND", __func__);
send_btc_nlink_msg(WLAN_MODULE_DOWN_IND, 0);
#ifdef WLAN_BTAMP_FEATURE
- VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,"%s: Take down AMP PAL", __FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,"%s: Take down AMP PAL", __func__);
BSL_Deinit(vos_get_global_context(VOS_MODULE_ID_HDD, NULL));
#endif
//WLANBAP_Close(vos_get_global_context(VOS_MODULE_ID_HDD, NULL));
@@ -4026,7 +4026,7 @@
{
case WE_CLEAR_STATS:
{
- VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,"%s: clearing", __FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,"%s: clearing", __func__);
memset(&pAdapter->stats, 0, sizeof(pAdapter->stats));
memset(&pAdapter->hdd_stats, 0, sizeof(pAdapter->hdd_stats));
break;
@@ -4073,7 +4073,7 @@
#ifdef WLAN_BTAMP_FEATURE
case WE_ENABLE_AMP:
{
- VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,"%s: enabling AMP", __FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,"%s: enabling AMP", __func__);
WLANBAP_RegisterWithHCI(pAdapter);
break;
}
@@ -4082,7 +4082,7 @@
hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX( pAdapter );
VOS_STATUS status;
- VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,"%s: disabling AMP", __FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,"%s: disabling AMP", __func__);
pHddCtx = WLAN_HDD_GET_CTX( pAdapter );
status = WLANBAP_StopAmp();
@@ -4128,7 +4128,7 @@
default:
{
- hddLog(LOGE, "%s: unknown ioctl %d", __FUNCTION__, sub_cmd);
+ hddLog(LOGE, "%s: unknown ioctl %d", __func__, sub_cmd);
break;
}
}
@@ -4146,7 +4146,7 @@
int apps_args[MAX_VAR_ARGS] = {0};
int num_args = wrqu->data.length;
- hddLog(LOG1, "%s: Received length %d", __FUNCTION__, wrqu->data.length);
+ hddLog(LOG1, "%s: Received length %d", __func__, wrqu->data.length);
if (num_args > MAX_VAR_ARGS)
{
num_args = MAX_VAR_ARGS;
@@ -4158,7 +4158,7 @@
case WE_LOG_DUMP_CMD:
{
hddLog(LOG1, "%s: LOG_DUMP %d arg1 %d arg2 %d arg3 %d arg4 %d",
- __FUNCTION__, apps_args[0], apps_args[1], apps_args[2],
+ __func__, apps_args[0], apps_args[1], apps_args[2],
apps_args[3], apps_args[4]);
logPrintf(hHal, apps_args[0], apps_args[1], apps_args[2],
@@ -4182,7 +4182,7 @@
hddLog(LOG1, "%s: P2P_NOA_ATTR:oppPS %d ctWindow %d duration %d "
"interval %d count %d single noa duration %d PsSelection %x",
- __FUNCTION__, apps_args[0], apps_args[1], apps_args[2],
+ __func__, apps_args[0], apps_args[1], apps_args[2],
apps_args[3], apps_args[4], apps_args[5], apps_args[6]);
hdd_setP2pPs(dev, &p2pNoA);
@@ -4399,13 +4399,13 @@
WAPI_FUNCTION_MODE *pWapiMode = (WAPI_FUNCTION_MODE *)wrqu->data.pointer;
hddLog(LOG1, "The function iw_qcom_set_wapi_mode called");
- hddLog(LOG1, "%s: Received data %s", __FUNCTION__, (char*)wrqu->data.pointer);
- hddLog(LOG1, "%s: Received length %d", __FUNCTION__, wrqu->data.length);
- hddLog(LOG1, "%s: Input Data (wreq) WAPI Mode:%02d", __FUNCTION__, pWapiMode->wapiMode);
+ hddLog(LOG1, "%s: Received data %s", __func__, (char*)wrqu->data.pointer);
+ hddLog(LOG1, "%s: Received length %d", __func__, wrqu->data.length);
+ hddLog(LOG1, "%s: Input Data (wreq) WAPI Mode:%02d", __func__, pWapiMode->wapiMode);
if(WZC_ORIGINAL == pWapiMode->wapiMode) {
- hddLog(LOG1, "%s: WAPI Mode Set to OFF", __FUNCTION__);
+ hddLog(LOG1, "%s: WAPI Mode Set to OFF", __func__);
/* Set Encryption mode to defualt , this allows next successfull non-WAPI Association */
pRoamProfile->EncryptionType.numEntries = 1;
pRoamProfile->EncryptionType.encryptionType[0] = eCSR_ENCRYPT_TYPE_NONE;
@@ -4417,7 +4417,7 @@
pRoamProfile->AuthType.authType[0] = pHddStaCtx->conn_info.authType;
}
else if(WAPI_EXTENTION == pWapiMode->wapiMode) {
- hddLog(LOG1, "%s: WAPI Mode Set to ON", __FUNCTION__);
+ hddLog(LOG1, "%s: WAPI Mode Set to ON", __func__);
}
else
return -EINVAL;
@@ -4436,7 +4436,7 @@
hddLog(LOG1, "The function iw_qcom_get_wapi_mode called");
pWapiMode->wapiMode = pAdapter->wapi_info.nWapiMode;
- hddLog(LOG1, "%s: GET WAPI Mode Value:%02d", __FUNCTION__, pWapiMode->wapiMode);
+ hddLog(LOG1, "%s: GET WAPI Mode Value:%02d", __func__, pWapiMode->wapiMode);
printk("\nGET WAPI MODE:%d",pWapiMode->wapiMode);
return 0;
}
@@ -4449,23 +4449,23 @@
WAPI_AssocInfo *pWapiAssocInfo = (WAPI_AssocInfo *)(extra);
int i = 0, j = 0;
hddLog(LOG1, "The function iw_qcom_set_wapi_assoc_info called");
- hddLog(LOG1, "%s: Received length %d", __FUNCTION__, wrqu->data.length);
- hddLog(LOG1, "%s: Received data %s", __FUNCTION__, (char*)wrqu->data.pointer);
- hddLog(LOG1, "%s: Received data %s", __FUNCTION__, (char*)extra);
+ hddLog(LOG1, "%s: Received length %d", __func__, wrqu->data.length);
+ hddLog(LOG1, "%s: Received data %s", __func__, (char*)wrqu->data.pointer);
+ hddLog(LOG1, "%s: Received data %s", __func__, (char*)extra);
VOS_ASSERT(pWapiAssocInfo);
- hddLog(LOG1, "%s: INPUT DATA:\nElement ID:0x%02x Length:0x%02x Version:0x%04x\n",__FUNCTION__,pWapiAssocInfo->elementID,pWapiAssocInfo->length,pWapiAssocInfo->version);
- hddLog(LOG1,"%s: akm Suite Cnt:0x%04x",__FUNCTION__,pWapiAssocInfo->akmSuiteCount);
+ hddLog(LOG1, "%s: INPUT DATA:\nElement ID:0x%02x Length:0x%02x Version:0x%04x\n",__func__,pWapiAssocInfo->elementID,pWapiAssocInfo->length,pWapiAssocInfo->version);
+ hddLog(LOG1,"%s: akm Suite Cnt:0x%04x",__func__,pWapiAssocInfo->akmSuiteCount);
for(i =0 ; i < 16 ; i++)
hddLog(LOG1,"akm suite[%02d]:0x%08lx",i,pWapiAssocInfo->akmSuite[i]);
- hddLog(LOG1,"%s: Unicast Suite Cnt:0x%04x",__FUNCTION__,pWapiAssocInfo->unicastSuiteCount);
+ hddLog(LOG1,"%s: Unicast Suite Cnt:0x%04x",__func__,pWapiAssocInfo->unicastSuiteCount);
for(i =0 ; i < 16 ; i++)
hddLog(LOG1, "Unicast suite[%02d]:0x%08lx",i,pWapiAssocInfo->unicastSuite[i]);
- hddLog(LOG1,"%s: Multicast suite:0x%08lx Wapi capa:0x%04x",__FUNCTION__,pWapiAssocInfo->multicastSuite,pWapiAssocInfo->wapiCability);
- hddLog(LOG1, "%s: BKID Cnt:0x%04x\n",__FUNCTION__,pWapiAssocInfo->bkidCount);
+ hddLog(LOG1,"%s: Multicast suite:0x%08lx Wapi capa:0x%04x",__func__,pWapiAssocInfo->multicastSuite,pWapiAssocInfo->wapiCability);
+ hddLog(LOG1, "%s: BKID Cnt:0x%04x\n",__func__,pWapiAssocInfo->bkidCount);
for(i = 0 ; i < 16 ; i++) {
hddLog(LOG1, "BKID List[%02d].bkid:0x",i);
for(j = 0 ; j < 16 ; j++)
@@ -4477,12 +4477,12 @@
* case of WPA. Only the auth mode information needs to be
* extracted here*/
if ( pWapiAssocInfo->akmSuite[0] == WAPI_PSK_AKM_SUITE ) {
- hddLog(LOG1, "%s: WAPI AUTH MODE SET TO PSK",__FUNCTION__);
+ hddLog(LOG1, "%s: WAPI AUTH MODE SET TO PSK",__func__);
pAdapter->wapi_info.wapiAuthMode = WAPI_AUTH_MODE_PSK;
}
if ( pWapiAssocInfo->akmSuite[0] == WAPI_CERT_AKM_SUITE) {
- hddLog(LOG1, "%s: WAPI AUTH MODE SET TO CERTIFICATE",__FUNCTION__);
+ hddLog(LOG1, "%s: WAPI AUTH MODE SET TO CERTIFICATE",__func__);
pAdapter->wapi_info.wapiAuthMode = WAPI_AUTH_MODE_CERT;
}
return 0;
@@ -4504,21 +4504,21 @@
WLAN_WAPI_KEY *pWapiKey = (WLAN_WAPI_KEY *)(extra);
hddLog(LOG1, "The function iw_qcom_set_wapi_key called ");
- hddLog(LOG1, "%s: Received length %d", __FUNCTION__, wrqu->data.length);
- hddLog(LOG1, "%s: Received data %s", __FUNCTION__, (char*)wrqu->data.pointer);
- hddLog(LOG1, "%s: Received data %s", __FUNCTION__, (char*)extra);
+ hddLog(LOG1, "%s: Received length %d", __func__, wrqu->data.length);
+ hddLog(LOG1, "%s: Received data %s", __func__, (char*)wrqu->data.pointer);
+ hddLog(LOG1, "%s: Received data %s", __func__, (char*)extra);
- hddLog(LOG1,":s: INPUT DATA:\nKey Type:0x%02x Key Direction:0x%02x KEY ID:0x%02x\n", __FUNCTION__,pWapiKey->keyType,pWapiKey->keyDirection,pWapiKey->keyId);
+ hddLog(LOG1,":s: INPUT DATA:\nKey Type:0x%02x Key Direction:0x%02x KEY ID:0x%02x\n", __func__,pWapiKey->keyType,pWapiKey->keyDirection,pWapiKey->keyId);
hddLog(LOG1,"Add Index:0x");
for(i =0 ; i < 12 ; i++)
hddLog(LOG1,"%02x",pWapiKey->addrIndex[i]);
- hddLog(LOG1,"\n%s: WAPI ENCRYPTION KEY LENGTH:0x%04x", __FUNCTION__,pWapiKey->wpiekLen);
+ hddLog(LOG1,"\n%s: WAPI ENCRYPTION KEY LENGTH:0x%04x", __func__,pWapiKey->wpiekLen);
hddLog(LOG1, "WAPI ENCRYPTION KEY:0x");
for(i =0 ; i < 16 ; i++)
hddLog(LOG1,"%02x",pWapiKey->wpiek[i]);
- hddLog(LOG1,"\n%s: WAPI INTEGRITY CHECK KEY LENGTH:0x%04x", __FUNCTION__,pWapiKey->wpickLen);
+ hddLog(LOG1,"\n%s: WAPI INTEGRITY CHECK KEY LENGTH:0x%04x", __func__,pWapiKey->wpickLen);
hddLog(LOG1,"WAPI INTEGRITY CHECK KEY:0x");
for(i =0 ; i < 16 ; i++)
hddLog(LOG1,"%02x",pWapiKey->wpick[i]);
@@ -4555,9 +4555,9 @@
{
//Any other option is invalid.
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
- "[%4d] %s() failed to Set Key. Invalid key type %d", __LINE__,__FUNCTION__ , -1 );
+ "[%4d] %s() failed to Set Key. Invalid key type %d", __LINE__,__func__ , -1 );
- hddLog(LOGE," %s: Error WAPI Key Add Type",__FUNCTION__);
+ hddLog(LOGE," %s: Error WAPI Key Add Type",__func__);
halStatus = !eHAL_STATUS_SUCCESS; // NEED TO UPDATE THIS WITH CORRECT VALUE
break; // NEED RETURN FROM HERE ????
}
@@ -4609,11 +4609,11 @@
#endif
hddLog(LOG1, "The function iw_qcom_set_wapi_bkid called");
- hddLog(LOG1, "%s: Received length %d", __FUNCTION__, wrqu->data.length);
- hddLog(LOG1, "%s: Received data %s", __FUNCTION__, (char*)wrqu->data.pointer);
- hddLog(LOG1, "%s: Received data %s", __FUNCTION__, (char*)extra);
+ hddLog(LOG1, "%s: Received length %d", __func__, wrqu->data.length);
+ hddLog(LOG1, "%s: Received data %s", __func__, (char*)wrqu->data.pointer);
+ hddLog(LOG1, "%s: Received data %s", __func__, (char*)extra);
- hddLog(LOG1,"%s: INPUT DATA:\n BKID Length:0x%08lx\n", __FUNCTION__,pBkid->length);
+ hddLog(LOG1,"%s: INPUT DATA:\n BKID Length:0x%08lx\n", __func__,pBkid->length);
hddLog(LOG1,"%s: BKID Cnt:0x%04lx",pBkid->BKIDCount);
hddLog(LOG1,"BKID KEY LIST[0]:0x");
@@ -4692,7 +4692,7 @@
hddLog(VOS_TRACE_LEVEL_INFO_HIGH,
"%s: Set MC BC Filter Config request: %d suspend %d",
- __FUNCTION__, pRequest->mcastBcastFilterSetting,
+ __func__, pRequest->mcastBcastFilterSetting,
pHddCtx->hdd_wlan_suspended);
wlanRxpFilterParam = vos_mem_malloc(sizeof(tSirWlanSetRxpFilters));
@@ -4770,7 +4770,7 @@
hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev);
hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
- hddLog(VOS_TRACE_LEVEL_INFO_HIGH, "%s: ", __FUNCTION__);
+ hddLog(VOS_TRACE_LEVEL_INFO_HIGH, "%s: ", __func__);
pHddCtx->dynamic_mcbc_filter.enableCfg = FALSE;
@@ -4788,7 +4788,7 @@
switch (pRequest->offloadType)
{
case WLAN_IPV4_ARP_REPLY_OFFLOAD:
- hddLog(VOS_TRACE_LEVEL_WARN, "%s: Host offload request: ARP reply", __FUNCTION__);
+ hddLog(VOS_TRACE_LEVEL_WARN, "%s: Host offload request: ARP reply", __func__);
switch (pRequest->enableOrDisable)
{
case WLAN_OFFLOAD_DISABLE:
@@ -4806,7 +4806,7 @@
case WLAN_IPV6_NEIGHBOR_DISCOVERY_OFFLOAD:
hddLog(VOS_TRACE_LEVEL_INFO_HIGH, "%s: Host offload request: neighbor discovery\n",
- __FUNCTION__);
+ __func__);
switch (pRequest->enableOrDisable)
{
case WLAN_OFFLOAD_DISABLE:
@@ -4858,18 +4858,18 @@
/* Debug display of request components. */
hddLog(VOS_TRACE_LEVEL_INFO, "%s: Set Keep Alive Request : TimePeriod %d size %d",
- __FUNCTION__,pRequest->timePeriod, sizeof(tKeepAliveRequest));
+ __func__,pRequest->timePeriod, sizeof(tKeepAliveRequest));
switch (pRequest->packetType)
{
case WLAN_KEEP_ALIVE_NULL_PKT:
- hddLog(VOS_TRACE_LEVEL_WARN, "%s: Keep Alive Request: Tx NULL", __FUNCTION__);
+ hddLog(VOS_TRACE_LEVEL_WARN, "%s: Keep Alive Request: Tx NULL", __func__);
break;
case WLAN_KEEP_ALIVE_UNSOLICIT_ARP_RSP:
hddLog(VOS_TRACE_LEVEL_INFO_HIGH, "%s: Keep Alive Request: Tx UnSolicited ARP RSP\n",
- __FUNCTION__);
+ __func__);
hddLog(VOS_TRACE_LEVEL_WARN, " Host IP address: %d.%d.%d.%d",
pRequest->hostIpv4Addr[0], pRequest->hostIpv4Addr[1],
@@ -4917,19 +4917,19 @@
if (pHddCtx->cfg_ini->disablePacketFilter)
{
hddLog(VOS_TRACE_LEVEL_FATAL, "%s: Packet Filtering Disabled. Returning ",
- __FUNCTION__ );
+ __func__ );
return 0;
}
/* Debug display of request components. */
hddLog(VOS_TRACE_LEVEL_ERROR, "%s: Packet Filter Request : FA %d params %d",
- __FUNCTION__, pRequest->filterAction, pRequest->numParams);
+ __func__, pRequest->filterAction, pRequest->numParams);
switch (pRequest->filterAction)
{
case HDD_RCV_FILTER_SET:
hddLog(VOS_TRACE_LEVEL_INFO, "%s: Set Packet Filter Request for Id: %d",
- __FUNCTION__, pRequest->filterId);
+ __func__, pRequest->filterId);
packetFilterSetReq.filterId = pRequest->filterId;
if ( pRequest->numParams >= HDD_MAX_CMP_PER_PACKET_FILTER)
@@ -4984,7 +4984,7 @@
case HDD_RCV_FILTER_CLEAR:
hddLog(VOS_TRACE_LEVEL_INFO_HIGH, "%s: Clear Packet Filter Request for Id: %d\n",
- __FUNCTION__, pRequest->filterId);
+ __func__, pRequest->filterId);
packetFilterClrReq.filterId = pRequest->filterId;
if (eHAL_STATUS_SUCCESS != sme_ReceiveFilterClearFilter(pHddCtx->hHal, &packetFilterClrReq, sessionId))
{
@@ -4996,7 +4996,7 @@
default :
hddLog(VOS_TRACE_LEVEL_INFO_HIGH, "%s: Packet Filter Request: Invalid %d\n",
- __FUNCTION__, pRequest->filterAction);
+ __func__, pRequest->filterAction);
return -EINVAL;
}
return 0;
@@ -5093,7 +5093,7 @@
{
hddLog(VOS_TRACE_LEVEL_ERROR,
"%s: Unable to retrieve SME statistics",
- __FUNCTION__);
+ __func__);
return -EINVAL;
}
@@ -5104,7 +5104,7 @@
{
hddLog(VOS_TRACE_LEVEL_ERROR,
"%s: SME timeout while retrieving statistics",
- __FUNCTION__);
+ __func__);
/*Remove the SME statistics list by passing NULL in callback argument*/
status = sme_GetStatistics( pHddCtx->hHal, eCSR_HDD,
SME_SUMMARY_STATS |
@@ -5568,13 +5568,13 @@
}
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, "%s: change band to %u",
- __FUNCTION__, band);
+ __func__, band);
if (band == eCSR_BAND_MAX)
{
/* Received change band request with invalid band value */
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
- "%s: Invalid band value %u", __FUNCTION__, band);
+ "%s: Invalid band value %u", __func__, band);
return -EIO;
}
@@ -5583,7 +5583,7 @@
(band == eCSR_BAND_ALL && pHddCtx->cfg_ini->nBandCapability!=0))
{
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_FATAL,
- "%s: band value %u violate INI settings %u", __FUNCTION__,
+ "%s: band value %u violate INI settings %u", __func__,
band, pHddCtx->cfg_ini->nBandCapability);
return -EIO;
}
@@ -5592,7 +5592,7 @@
{
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
"%s: Failed to get current band config",
- __FUNCTION__);
+ __func__);
return -EIO;
}
@@ -5604,7 +5604,7 @@
*/
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
"%s: Current band value = %u, new setting %u ",
- __FUNCTION__, currBand, band);
+ __func__, currBand, band);
if (hdd_connIsConnected(WLAN_HDD_GET_STATION_CTX_PTR(pAdapter)))
{
@@ -5640,7 +5640,7 @@
if(lrc <= 0) {
hddLog(VOS_TRACE_LEVEL_ERROR,"%s: %s while while waiting for csrRoamDisconnect ",
- __FUNCTION__, (0 == lrc) ? "Timeout" : "Interrupt");
+ __func__, (0 == lrc) ? "Timeout" : "Interrupt");
return (0 == lrc) ? -ETIMEDOUT : -EINTR;
}
@@ -5652,7 +5652,7 @@
{
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_FATAL,
"%s: failed to set the band value to %u ",
- __FUNCTION__, band);
+ __func__, band);
return -EINVAL;
}
#ifdef CONFIG_CFG80211
@@ -5669,7 +5669,7 @@
tANI_U8 *ptr = (tANI_U8*)wrqu->data.pointer;
int ret = 0;
- VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,"%s: ", __FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,"%s: ", __func__);
if (memcmp(ptr, "SETBAND ", 8) == 0)
{
diff --git a/CORE/HDD/src/wlan_hdd_wmm.c b/CORE/HDD/src/wlan_hdd_wmm.c
index 46fbb7c..025d263 100644
--- a/CORE/HDD/src/wlan_hdd_wmm.c
+++ b/CORE/HDD/src/wlan_hdd_wmm.c
@@ -142,7 +142,7 @@
{
VOS_TRACE(VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
"%s: Invoked with invalid TSPEC",
- __FUNCTION__);
+ __func__);
return;
}
@@ -161,7 +161,7 @@
// this is OK, there just won't be U-APSD
VOS_TRACE(VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
"%s: No service interval supplied",
- __FUNCTION__);
+ __func__);
return;
}
@@ -177,7 +177,7 @@
{
VOS_TRACE(VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
"%s: No change in U-APSD parameters",
- __FUNCTION__);
+ __func__);
return;
}
@@ -186,7 +186,7 @@
{
VOS_TRACE(VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
"%s: BMPS is not enabled",
- __FUNCTION__);
+ __func__);
return;
}
@@ -194,7 +194,7 @@
{
VOS_TRACE(VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
"%s: U-APSD is not enabled",
- __FUNCTION__);
+ __func__);
return;
}
@@ -212,7 +212,7 @@
{
VOS_TRACE( VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
"%s: Failed to enable U-APSD for AC=%d",
- __FUNCTION__, acType );
+ __func__, acType );
return;
}
@@ -225,7 +225,7 @@
VOS_TRACE(VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
"%s: Enabled UAPSD in TL srv_int=%ld "
"susp_int=%ld dir=%d AC=%d",
- __FUNCTION__,
+ __func__,
service_interval,
suspension_interval,
direction,
@@ -261,7 +261,7 @@
{
VOS_TRACE( VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
"%s: Failed to disable U-APSD for AC=%d",
- __FUNCTION__, acType );
+ __func__, acType );
}
else
{
@@ -269,7 +269,7 @@
pAc->wmmAcUapsdInfoValid = VOS_FALSE;
VOS_TRACE(VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
"%s: Disabled UAPSD in TL for AC=%d",
- __FUNCTION__,
+ __func__,
acType);
}
}
@@ -291,7 +291,7 @@
VOS_TRACE(VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
"%s: Entered, context %p",
- __FUNCTION__, pQosContext);
+ __func__, pQosContext);
if (unlikely((NULL == pQosContext) ||
(HDD_WMM_CTX_MAGIC != pQosContext->magic)))
@@ -339,14 +339,14 @@
VOS_TRACE(VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
"%s: Entered, context %p",
- __FUNCTION__, pQosContext);
+ __func__, pQosContext);
if (unlikely((NULL == pQosContext) ||
(HDD_WMM_CTX_MAGIC != pQosContext->magic)))
{
VOS_TRACE(VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
"%s: Invalid QoS Context",
- __FUNCTION__);
+ __func__);
return;
}
@@ -367,7 +367,7 @@
// send the event
VOS_TRACE(VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
- "%s: Sending [%s]", __FUNCTION__, buf);
+ "%s: Sending [%s]", __func__, buf);
wireless_send_event(pAdapter->dev, IWEVCUSTOM, &wrqu, buf);
}
@@ -596,14 +596,14 @@
VOS_TRACE(VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
"%s: Entered, context %p",
- __FUNCTION__, pQosContext);
+ __func__, pQosContext);
if (unlikely((NULL == pQosContext) ||
(HDD_WMM_CTX_MAGIC != pQosContext->magic)))
{
VOS_TRACE(VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
"%s: Invalid QoS Context",
- __FUNCTION__);
+ __func__);
return eHAL_STATUS_FAILURE;
}
@@ -613,7 +613,7 @@
VOS_TRACE(VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
"%s: status %d flowid %d info %p",
- __FUNCTION__, smeStatus, qosFlowId, pCurrentQosInfo);
+ __func__, smeStatus, qosFlowId, pCurrentQosInfo);
switch (smeStatus)
{
@@ -621,7 +621,7 @@
case SME_QOS_STATUS_SETUP_SUCCESS_IND:
VOS_TRACE(VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
"%s: Setup is complete",
- __FUNCTION__);
+ __func__);
// there will always be a TSPEC returned with this status, even if
// a TSPEC is not exchanged OTA
@@ -638,7 +638,7 @@
VOS_TRACE(VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
"%s: Implicit Qos, notifying TL for TL AC %d",
- __FUNCTION__, acType);
+ __func__, acType);
// this was triggered by implicit QoS so we know packets are pending
// update state
@@ -655,14 +655,14 @@
{
VOS_TRACE( VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
"%s: Failed to signal TL for AC=%d",
- __FUNCTION__, acType );
+ __func__, acType );
}
}
else
{
VOS_TRACE(VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
"%s: Explicit Qos, notifying userspace",
- __FUNCTION__);
+ __func__);
// this was triggered by an application
pQosContext->lastStatus = HDD_WLAN_WMM_STATUS_SETUP_SUCCESS;
@@ -674,7 +674,7 @@
if (pCurrentQosInfo->inactivity_interval) {
VOS_TRACE(VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
"%s: Inactivity timer value = %d for AC=%d\n",
- __FUNCTION__, pCurrentQosInfo->inactivity_interval, acType);
+ __func__, pCurrentQosInfo->inactivity_interval, acType);
hdd_wmm_enable_inactivity_timer(pQosContext, pCurrentQosInfo->inactivity_interval);
}
#endif // FEATURE_WLAN_CCX
@@ -687,14 +687,14 @@
case SME_QOS_STATUS_SETUP_SUCCESS_APSD_SET_ALREADY:
VOS_TRACE(VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
"%s: Setup is complete (U-APSD set previously)",
- __FUNCTION__);
+ __func__);
if (HDD_WMM_HANDLE_IMPLICIT == pQosContext->handle)
{
VOS_TRACE(VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
"%s: Implicit Qos, notifying TL",
- __FUNCTION__);
+ __func__);
// this was triggered by implicit QoS so we know packets are pending
// update state
@@ -711,14 +711,14 @@
{
VOS_TRACE( VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
"%s: Failed to signal TL for AC=%d",
- __FUNCTION__, acType );
+ __func__, acType );
}
}
else
{
VOS_TRACE(VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
"%s: Explicit Qos, notifying userspace",
- __FUNCTION__);
+ __func__);
// this was triggered by an application
pQosContext->lastStatus = HDD_WLAN_WMM_STATUS_SETUP_SUCCESS_NO_ACM_UAPSD_EXISTING;
@@ -730,7 +730,7 @@
case SME_QOS_STATUS_SETUP_FAILURE_RSP:
VOS_TRACE(VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
"%s: Setup failed",
- __FUNCTION__);
+ __func__);
// QoS setup failed
if (HDD_WMM_HANDLE_IMPLICIT == pQosContext->handle)
@@ -738,7 +738,7 @@
VOS_TRACE(VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
"%s: Implicit Qos, notifying TL",
- __FUNCTION__);
+ __func__);
// we note the failure, but we also mark access as allowed so that
// the packets will flow. Note that the MAC will "do the right thing"
@@ -755,14 +755,14 @@
{
VOS_TRACE( VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
"%s: Failed to signal TL for AC=%d",
- __FUNCTION__, acType );
+ __func__, acType );
}
}
else
{
VOS_TRACE(VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
"%s: Explicit Qos, notifying userspace",
- __FUNCTION__);
+ __func__);
// this was triggered by an application
pQosContext->lastStatus = HDD_WLAN_WMM_STATUS_SETUP_FAILED;
@@ -781,7 +781,7 @@
case SME_QOS_STATUS_SETUP_INVALID_PARAMS_RSP:
VOS_TRACE(VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
"%s: Setup Invalid Params, notify TL",
- __FUNCTION__);
+ __func__);
// QoS setup failed
if (HDD_WMM_HANDLE_IMPLICIT == pQosContext->handle)
@@ -789,7 +789,7 @@
VOS_TRACE(VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
"%s: Implicit Qos, notifying TL",
- __FUNCTION__);
+ __func__);
// we note the failure, but we also mark access as allowed so that
// the packets will flow. Note that the MAC will "do the right thing"
@@ -806,14 +806,14 @@
{
VOS_TRACE( VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
"%s: Failed to signal TL for AC=%d",
- __FUNCTION__, acType );
+ __func__, acType );
}
}
else
{
VOS_TRACE(VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
"%s: Explicit Qos, notifying userspace",
- __FUNCTION__);
+ __func__);
// this was triggered by an application
pQosContext->lastStatus = HDD_WLAN_WMM_STATUS_SETUP_FAILED_BAD_PARAM;
@@ -824,12 +824,12 @@
case SME_QOS_STATUS_SETUP_NOT_QOS_AP_RSP:
VOS_TRACE( VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
"%s: Setup failed, not a QoS AP\n",
- __FUNCTION__);
+ __func__);
if (!HDD_WMM_HANDLE_IMPLICIT == pQosContext->handle)
{
VOS_TRACE(VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
"%s: Explicit Qos, notifying userspace",
- __FUNCTION__);
+ __func__);
// this was triggered by an application
pQosContext->lastStatus = HDD_WLAN_WMM_STATUS_SETUP_FAILED_NO_WMM;
@@ -840,14 +840,14 @@
case SME_QOS_STATUS_SETUP_REQ_PENDING_RSP:
VOS_TRACE(VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
"%s: Setup pending",
- __FUNCTION__);
+ __func__);
// not a callback status -- ignore if we get it
break;
case SME_QOS_STATUS_SETUP_MODIFIED_IND:
VOS_TRACE(VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
"%s: Setup modified",
- __FUNCTION__);
+ __func__);
if (pCurrentQosInfo)
{
// update the TSPEC
@@ -860,7 +860,7 @@
{
VOS_TRACE(VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
"%s: Explicit Qos, notifying userspace",
- __FUNCTION__);
+ __func__);
// this was triggered by an application
pQosContext->lastStatus = HDD_WLAN_WMM_STATUS_MODIFIED;
@@ -878,7 +878,7 @@
VOS_TRACE(VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
"%s: Implicit Qos, notifying TL",
- __FUNCTION__);
+ __func__);
// this was triggered by implicit QoS so we know packets are pending
pAc->wmmAcAccessPending = VOS_FALSE;
@@ -894,14 +894,14 @@
{
VOS_TRACE( VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
"%s: Failed to signal TL for AC=%d",
- __FUNCTION__, acType );
+ __func__, acType );
}
}
else
{
VOS_TRACE(VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
"%s: Explicit Qos, notifying userspace",
- __FUNCTION__);
+ __func__);
// this was triggered by an application
pQosContext->lastStatus = HDD_WLAN_WMM_STATUS_SETUP_SUCCESS_NO_ACM_NO_UAPSD;
@@ -916,14 +916,14 @@
case SME_QOS_STATUS_SETUP_SUCCESS_IND_APSD_SET_FAILED:
VOS_TRACE(VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
"%s: Setup successful but U-APSD failed",
- __FUNCTION__);
+ __func__);
if (HDD_WMM_HANDLE_IMPLICIT == pQosContext->handle)
{
VOS_TRACE(VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
"%s: Implicit Qos, notifying TL",
- __FUNCTION__);
+ __func__);
// QoS setup was successful but setting U=APSD failed
// Since the OTA part of the request was successful, we don't mark
@@ -943,14 +943,14 @@
{
VOS_TRACE( VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
"%s: Failed to signal TL for AC=%d",
- __FUNCTION__, acType );
+ __func__, acType );
}
}
else
{
VOS_TRACE(VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
"%s: Explicit Qos, notifying userspace",
- __FUNCTION__);
+ __func__);
// this was triggered by an application
pQosContext->lastStatus = HDD_WLAN_WMM_STATUS_SETUP_UAPSD_SET_FAILED;
@@ -965,13 +965,13 @@
case SME_QOS_STATUS_RELEASE_SUCCESS_RSP:
VOS_TRACE(VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
"%s: Release is complete",
- __FUNCTION__);
+ __func__);
if (pCurrentQosInfo)
{
VOS_TRACE(VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
"%s: flows still active",
- __FUNCTION__);
+ __func__);
// there is still at least one flow active for this AC
// so update the AC state
@@ -986,7 +986,7 @@
{
VOS_TRACE(VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
"%s: last flow",
- __FUNCTION__);
+ __func__);
// this is the last flow active for this AC so update the AC state
pAc->wmmAcTspecValid = VOS_FALSE;
@@ -999,7 +999,7 @@
{
VOS_TRACE(VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
"%s: Explicit Qos, notifying userspace",
- __FUNCTION__);
+ __func__);
// this was triggered by an application
pQosContext->lastStatus = HDD_WLAN_WMM_STATUS_RELEASE_SUCCESS;
@@ -1013,14 +1013,14 @@
case SME_QOS_STATUS_RELEASE_FAILURE_RSP:
VOS_TRACE(VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
"%s: Release failure",
- __FUNCTION__);
+ __func__);
// we don't need to update our state or TL since nothing has changed
if (HDD_WMM_HANDLE_IMPLICIT != pQosContext->handle)
{
VOS_TRACE(VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
"%s: Explicit Qos, notifying userspace",
- __FUNCTION__);
+ __func__);
// this was triggered by an application
pQosContext->lastStatus = HDD_WLAN_WMM_STATUS_RELEASE_FAILED;
@@ -1032,7 +1032,7 @@
case SME_QOS_STATUS_RELEASE_QOS_LOST_IND:
VOS_TRACE(VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
"%s: QOS Lost indication received",
- __FUNCTION__);
+ __func__);
// current TSPEC is no longer valid
pAc->wmmAcTspecValid = VOS_FALSE;
@@ -1050,7 +1050,7 @@
{
VOS_TRACE(VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
"%s: Explicit Qos, notifying userspace",
- __FUNCTION__);
+ __func__);
// this was triggered by an application
pQosContext->lastStatus = HDD_WLAN_WMM_STATUS_LOST;
@@ -1064,14 +1064,14 @@
case SME_QOS_STATUS_RELEASE_REQ_PENDING_RSP:
VOS_TRACE(VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
"%s: Release pending",
- __FUNCTION__);
+ __func__);
// not a callback status -- ignore if we get it
break;
case SME_QOS_STATUS_RELEASE_INVALID_PARAMS_RSP:
VOS_TRACE(VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
"%s: Release Invalid Params",
- __FUNCTION__);
+ __func__);
if (HDD_WMM_HANDLE_IMPLICIT != pQosContext->handle)
{
// this was triggered by an application
@@ -1083,7 +1083,7 @@
case SME_QOS_STATUS_MODIFY_SETUP_SUCCESS_IND:
VOS_TRACE(VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
"%s: Modification is complete, notify TL",
- __FUNCTION__);
+ __func__);
// there will always be a TSPEC returned with this status, even if
// a TSPEC is not exchanged OTA
@@ -1131,7 +1131,7 @@
case SME_QOS_STATUS_MODIFY_SETUP_PENDING_RSP:
VOS_TRACE(VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
"%s: modification pending",
- __FUNCTION__);
+ __func__);
// not a callback status -- ignore if we get it
break;
@@ -1163,7 +1163,7 @@
case SME_QOS_STATUS_MODIFY_SETUP_SUCCESS_IND_APSD_SET_FAILED:
VOS_TRACE(VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
"%s: Modify successful but U-APSD failed",
- __FUNCTION__);
+ __func__);
// QoS modification was successful but setting U=APSD failed.
// This will always be an explicit QoS instance, so all we can
@@ -1197,7 +1197,7 @@
default:
VOS_TRACE( VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
"%s: unexpected SME Status=%d\n",
- __FUNCTION__, smeStatus );
+ __func__, smeStatus );
VOS_ASSERT(0);
}
@@ -1209,7 +1209,7 @@
VOS_TRACE(VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
"%s: complete, access for TL AC %d is%sallowed",
- __FUNCTION__,
+ __func__,
acType,
pAc->wmmAcAccessAllowed ? " " : " not ");
@@ -1240,13 +1240,13 @@
VOS_TRACE(VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
"%s: Entered, context %p",
- __FUNCTION__, pQosContext);
+ __func__, pQosContext);
if (unlikely(HDD_WMM_CTX_MAGIC != pQosContext->magic))
{
VOS_TRACE(VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
"%s: Invalid QoS Context",
- __FUNCTION__);
+ __func__);
return;
}
@@ -1256,13 +1256,13 @@
VOS_TRACE(VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
"%s: pAdapter %p acType %d",
- __FUNCTION__, pAdapter, acType);
+ __func__, pAdapter, acType);
if (!pAc->wmmAcAccessNeeded)
{
VOS_TRACE(VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
"%s: AC %d doesn't need service",
- __FUNCTION__, acType);
+ __func__, acType);
pQosContext->magic = 0;
kfree(pQosContext);
return;
@@ -1368,7 +1368,7 @@
VOS_TRACE(VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
"%s: sme_QosSetupReq returned %d flowid %d",
- __FUNCTION__, smeStatus, pQosContext->qosFlowId);
+ __func__, smeStatus, pQosContext->qosFlowId);
// need to check the return values and act appropriately
switch (smeStatus)
@@ -1379,7 +1379,7 @@
// all further work will be done in hdd_wmm_sme_callback()
VOS_TRACE(VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
"%s: Setup is pending, no further work",
- __FUNCTION__);
+ __func__);
break;
@@ -1402,7 +1402,7 @@
// signal TL that it has work to do
VOS_TRACE(VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
"%s: Setup is complete, notify TL",
- __FUNCTION__);
+ __func__);
pAc->wmmAcAccessAllowed = VOS_TRUE;
pAc->wmmAcAccessGranted = VOS_TRUE;
@@ -1416,7 +1416,7 @@
{
VOS_TRACE( VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
"%s: Failed to signal TL for AC=%d",
- __FUNCTION__, acType );
+ __func__, acType );
}
break;
@@ -1425,7 +1425,7 @@
default:
VOS_TRACE( VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
"%s: unexpected SME Status=%d\n",
- __FUNCTION__, smeStatus );
+ __func__, smeStatus );
VOS_ASSERT(0);
}
#endif
@@ -1448,7 +1448,7 @@
v_U8_t dscp;
VOS_TRACE(VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
- "%s: Entered", __FUNCTION__);
+ "%s: Entered", __func__);
// DSCP to User Priority Lookup Table
for (dscp = 0; dscp <= WLAN_HDD_MAX_DSCP; dscp++)
@@ -1483,7 +1483,7 @@
WLANTL_ACEnumType acType;
VOS_TRACE(VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
- "%s: Entered", __FUNCTION__);
+ "%s: Entered", __func__);
pAdapter->hddWmmStatus.wmmQap = VOS_FALSE;
INIT_LIST_HEAD(&pAdapter->hddWmmStatus.wmmContextList);
@@ -1519,7 +1519,7 @@
hdd_wmm_qos_context_t* pQosContext;
VOS_TRACE(VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
- "%s: Entered", __FUNCTION__);
+ "%s: Entered", __func__);
// free any context records that we still have linked
while (!list_empty(&pAdapter->hddWmmStatus.wmmContextList))
@@ -1563,7 +1563,7 @@
#ifdef HDD_WMM_DEBUG
VOS_TRACE(VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
- "%s: Entered", __FUNCTION__);
+ "%s: Entered", __func__);
#endif // HDD_WMM_DEBUG
pPkt = skb->data;
@@ -1572,7 +1572,7 @@
#ifdef HDD_WMM_DEBUG
VOS_TRACE(VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
"%s: proto/length is 0x%04x",
- __FUNCTION__, pHdr->eth_II.h_proto);
+ __func__, pHdr->eth_II.h_proto);
#endif // HDD_WMM_DEBUG
if (HDD_WMM_CLASSIFICATION_DSCP == (WLAN_HDD_GET_CTX(pAdapter))->cfg_ini->PktClassificationBasis)
@@ -1585,7 +1585,7 @@
#ifdef HDD_WMM_DEBUG
VOS_TRACE(VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
"%s: Ethernet II IP Packet, tos is %d",
- __FUNCTION__, tos);
+ __func__, tos);
#endif // HDD_WMM_DEBUG
}
@@ -1601,7 +1601,7 @@
#ifdef HDD_WMM_DEBUG
VOS_TRACE(VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
"%s: 802.3 LLC/SNAP IP Packet, tos is %d",
- __FUNCTION__, tos);
+ __func__, tos);
#endif // HDD_WMM_DEBUG
}
else if (pHdr->eth_II.h_proto == htons(ETH_P_8021Q))
@@ -1616,7 +1616,7 @@
#ifdef HDD_WMM_DEBUG
VOS_TRACE(VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
"%s: Ethernet II VLAN tagged IP Packet, tos is %d",
- __FUNCTION__, tos);
+ __func__, tos);
#endif // HDD_WMM_DEBUG
}
else if ((ntohs(pHdr->eth_IIv.h_vlan_encapsulated_proto) < WLAN_MIN_PROTO) &&
@@ -1631,7 +1631,7 @@
#ifdef HDD_WMM_DEBUG
VOS_TRACE(VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
"%s: 802.3 LLC/SNAP VLAN tagged IP Packet, tos is %d",
- __FUNCTION__, tos);
+ __func__, tos);
#endif // HDD_WMM_DEBUG
}
else
@@ -1640,7 +1640,7 @@
#ifdef HDD_WMM_DEBUG
VOS_TRACE(VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_WARN,
"%s: VLAN tagged Unhandled Protocol, using default tos",
- __FUNCTION__);
+ __func__);
#endif // HDD_WMM_DEBUG
tos = 0;
}
@@ -1651,7 +1651,7 @@
#ifdef HDD_WMM_DEBUG
VOS_TRACE(VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_WARN,
"%s: Unhandled Protocol, using default tos",
- __FUNCTION__);
+ __func__);
#endif // HDD_WMM_DEBUG
//Give the highest priority to 802.1x packet
if (pHdr->eth_II.h_proto == htons(HDD_ETHERTYPE_802_1_X))
@@ -1666,7 +1666,7 @@
#ifdef HDD_WMM_DEBUG
VOS_TRACE(VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
"%s: tos is %d, dscp is %d, up is %d",
- __FUNCTION__, tos, dscp, userPri);
+ __func__, tos, dscp, userPri);
#endif // HDD_WMM_DEBUG
}
@@ -1679,7 +1679,7 @@
#ifdef HDD_WMM_DEBUG
VOS_TRACE(VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
"%s: Tagged frame, UP is %d",
- __FUNCTION__, userPri);
+ __func__, userPri);
#endif // HDD_WMM_DEBUG
}
else
@@ -1688,7 +1688,7 @@
#ifdef HDD_WMM_DEBUG
VOS_TRACE(VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_WARN,
"%s: Untagged frame, using default UP",
- __FUNCTION__);
+ __func__);
#endif // HDD_WMM_DEBUG
//Give the highest priority to 802.1x packet
if (pHdr->eth_II.h_proto == htons(HDD_ETHERTYPE_802_1_X))
@@ -1703,7 +1703,7 @@
#ifdef HDD_WMM_DEBUG
VOS_TRACE(VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
"%s: Unknown classification scheme, using default UP",
- __FUNCTION__);
+ __func__);
#endif // HDD_WMM_DEBUG
userPri = SME_QOS_WMM_UP_BE;
}
@@ -1713,7 +1713,7 @@
#ifdef HDD_WMM_DEBUG
VOS_TRACE(VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
"%s: UP is %d, AC is %d",
- __FUNCTION__, userPri, acType);
+ __func__, userPri, acType);
#endif // HDD_WMM_DEBUG
*pUserPri = userPri;
@@ -1751,7 +1751,7 @@
if (eHAL_STATUS_SUCCESS != halTable_FindStaidByAddr(pMac, (tANI_U8 *)pDestMacAddress, &STAId))
{
VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_INFO,
- "%s: Failed to find right station", __FUNCTION__);
+ "%s: Failed to find right station", __func__);
*pSTAId = HDD_WLAN_INVALID_STA_ID;
goto done;
}
@@ -1759,7 +1759,7 @@
if (VOS_STATUS_SUCCESS != hdd_softap_GetStaId(pAdapter, pDestMacAddress, &STAId))
{
VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_INFO,
- "%s: Failed to find right station", __FUNCTION__);
+ "%s: Failed to find right station", __func__);
*pSTAId = HDD_WLAN_INVALID_STA_ID;
goto done;
}
@@ -1769,7 +1769,7 @@
if (FALSE == vos_is_macaddr_equal(&pAdapter->aStaInfo[STAId].macAddrSTA, pDestMacAddress))
{
VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_ERROR,
- "%s: Station MAC address does not matching", __FUNCTION__);
+ "%s: Station MAC address does not matching", __func__);
*pSTAId = HDD_WLAN_INVALID_STA_ID;
goto release_lock;
@@ -1840,14 +1840,14 @@
hdd_wmm_qos_context_t *pQosContext;
VOS_TRACE(VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
- "%s: Entered for AC %d", __FUNCTION__, acType);
+ "%s: Entered for AC %d", __func__, acType);
if (!hdd_wmm_is_active(pAdapter) || !(WLAN_HDD_GET_CTX(pAdapter))->cfg_ini->bImplicitQosEnabled)
{
// either we don't want QoS or the AP doesn't support QoS
// or we don't want to do implicit QoS
VOS_TRACE(VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
- "%s: QoS not configured on both ends ", __FUNCTION__);
+ "%s: QoS not configured on both ends ", __func__);
pAdapter->hddWmmStatus.wmmAcStatus[acType].wmmAcAccessAllowed = VOS_TRUE;
*pGranted = VOS_TRUE;
@@ -1861,7 +1861,7 @@
// request already pending so we need to wait for that response
VOS_TRACE(VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
"%s: Implicit QoS for TL AC %d already scheduled",
- __FUNCTION__, acType);
+ __func__, acType);
*pGranted = VOS_FALSE;
return VOS_STATUS_SUCCESS;
@@ -1875,7 +1875,7 @@
// allow access, but we'll be downgraded
VOS_TRACE(VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
"%s: Implicit QoS for TL AC %d previously failed",
- __FUNCTION__, acType);
+ __func__, acType);
pAdapter->hddWmmStatus.wmmAcStatus[acType].wmmAcAccessAllowed = VOS_TRUE;
*pGranted = VOS_TRUE;
@@ -1885,7 +1885,7 @@
// we need to establish implicit QoS
VOS_TRACE(VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
"%s: Need to schedule implicit QoS for TL AC %d, pAdapter is %p",
- __FUNCTION__, acType, pAdapter);
+ __func__, acType, pAdapter);
pAdapter->hddWmmStatus.wmmAcStatus[acType].wmmAcAccessNeeded = VOS_TRUE;
@@ -1894,7 +1894,7 @@
{
// no memory for QoS context. Nothing we can do but let data flow
VOS_TRACE(VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
- "%s: Unable to allocate context", __FUNCTION__);
+ "%s: Unable to allocate context", __func__);
pAdapter->hddWmmStatus.wmmAcStatus[acType].wmmAcAccessAllowed = VOS_TRUE;
*pGranted = VOS_TRUE;
return VOS_STATUS_SUCCESS;
@@ -1910,7 +1910,7 @@
VOS_TRACE(VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
"%s: Scheduling work for AC %d, context %p",
- __FUNCTION__, acType, pQosContext);
+ __func__, acType, pQosContext);
schedule_work(&pQosContext->wmmAcSetupImplicitQos);
@@ -1942,7 +1942,7 @@
// UAPSD for any access categories
VOS_TRACE(VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
- "%s: Entered", __FUNCTION__);
+ "%s: Entered", __func__);
if (pRoamInfo->fReassocReq)
{
@@ -1954,7 +1954,7 @@
// flow, and U-APSD parameters will be updated there
VOS_TRACE(VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
- "%s: Reassoc so no work, Exiting", __FUNCTION__);
+ "%s: Reassoc so no work, Exiting", __func__);
return VOS_STATUS_SUCCESS;
}
@@ -1963,7 +1963,7 @@
uapsdMask = pRoamInfo->u.pConnectedProfile->modifyProfileFields.uapsd_mask;
VOS_TRACE(VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
- "%s: U-APSD mask is 0x%02x", __FUNCTION__, (int) uapsdMask);
+ "%s: U-APSD mask is 0x%02x", __func__, (int) uapsdMask);
if (uapsdMask & HDD_AC_VO)
{
@@ -2022,7 +2022,7 @@
}
VOS_TRACE(VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
- "%s: Exiting", __FUNCTION__);
+ "%s: Exiting", __func__);
return VOS_STATUS_SUCCESS;
}
@@ -2058,7 +2058,7 @@
v_U8_t acmMask;
VOS_TRACE(VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
- "%s: Entered", __FUNCTION__);
+ "%s: Entered", __func__);
if ((eCSR_BSS_TYPE_INFRASTRUCTURE == eBssType) &&
pRoamInfo &&
@@ -2077,7 +2077,7 @@
VOS_TRACE(VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
"%s: qap is %d, qosConnection is %d, acmMask is 0x%x",
- __FUNCTION__, qap, qosConnection, acmMask);
+ __func__, qap, qosConnection, acmMask);
pAdapter->hddWmmStatus.wmmQap = qap;
pAdapter->hddWmmStatus.wmmQosConnection = qosConnection;
@@ -2090,7 +2090,7 @@
{
VOS_TRACE(VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
"%s: ac %d on",
- __FUNCTION__, ac);
+ __func__, ac);
// admission is required
pAdapter->hddWmmStatus.wmmAcStatus[ac].wmmAcAccessRequired = VOS_TRUE;
@@ -2101,7 +2101,7 @@
{
VOS_TRACE(VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
"%s: ac %d off",
- __FUNCTION__, ac);
+ __func__, ac);
// admission is not required so access is allowed
pAdapter->hddWmmStatus.wmmAcStatus[ac].wmmAcAccessRequired = VOS_FALSE;
pAdapter->hddWmmStatus.wmmAcStatus[ac].wmmAcAccessAllowed = VOS_TRUE;
@@ -2110,7 +2110,7 @@
}
VOS_TRACE(VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
- "%s: Exiting", __FUNCTION__);
+ "%s: Exiting", __func__);
return VOS_STATUS_SUCCESS;
}
@@ -2212,7 +2212,7 @@
v_BOOL_t found = VOS_FALSE;
VOS_TRACE(VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
- "%s: Entered with handle 0x%x", __FUNCTION__, handle);
+ "%s: Entered with handle 0x%x", __func__, handle);
// see if a context already exists with the given handle
mutex_lock(&pAdapter->hddWmmStatus.wmmLock);
@@ -2232,7 +2232,7 @@
// record with that handle already exists
VOS_TRACE(VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
"%s: Record already exists with handle 0x%x",
- __FUNCTION__, handle);
+ __func__, handle);
/* Application is trying to modify some of the Tspec params. Allow it */
smeStatus = sme_QosModifyReq(WLAN_HDD_GET_HAL_CTX(pAdapter),
@@ -2278,7 +2278,7 @@
{
// no memory for QoS context. Nothing we can do
VOS_TRACE(VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
- "%s: Unable to allocate QoS context", __FUNCTION__);
+ "%s: Unable to allocate QoS context", __func__);
return HDD_WLAN_WMM_STATUS_INTERNAL_FAILURE;
}
@@ -2292,7 +2292,7 @@
VOS_TRACE(VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
"%s: Setting up QoS, context %p",
- __FUNCTION__, pQosContext);
+ __func__, pQosContext);
mutex_lock(&pAdapter->hddWmmStatus.wmmLock);
list_add(&pQosContext->node, &pAdapter->hddWmmStatus.wmmContextList);
@@ -2309,7 +2309,7 @@
VOS_TRACE(VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
"%s: sme_QosSetupReq returned %d flowid %d",
- __FUNCTION__, smeStatus, pQosContext->qosFlowId);
+ __func__, smeStatus, pQosContext->qosFlowId);
// need to check the return value and act appropriately
switch (smeStatus)
@@ -2375,7 +2375,7 @@
#endif
VOS_TRACE(VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
- "%s: Entered with handle 0x%x", __FUNCTION__, handle);
+ "%s: Entered with handle 0x%x", __func__, handle);
// locate the context with the given handle
mutex_lock(&pAdapter->hddWmmStatus.wmmLock);
@@ -2397,21 +2397,21 @@
{
// we didn't find the handle
VOS_TRACE(VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
- "%s: handle 0x%x not found", __FUNCTION__, handle);
+ "%s: handle 0x%x not found", __func__, handle);
return HDD_WLAN_WMM_STATUS_RELEASE_FAILED_BAD_PARAM;
}
VOS_TRACE(VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
"%s: found handle 0x%x, flow %d, AC %d, context %p",
- __FUNCTION__, handle, qosFlowId, acType, pQosContext);
+ __func__, handle, qosFlowId, acType, pQosContext);
#ifndef WLAN_MDM_CODE_REDUCTION_OPT
smeStatus = sme_QosReleaseReq( WLAN_HDD_GET_HAL_CTX(pAdapter), qosFlowId );
VOS_TRACE(VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
"%s: SME flow %d released, SME status %d",
- __FUNCTION__, qosFlowId, smeStatus);
+ __func__, qosFlowId, smeStatus);
switch(smeStatus)
{
@@ -2478,7 +2478,7 @@
hdd_wlan_wmm_status_e status = HDD_WLAN_WMM_STATUS_LOST;
VOS_TRACE(VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
- "%s: Entered with handle 0x%x", __FUNCTION__, handle);
+ "%s: Entered with handle 0x%x", __func__, handle);
// locate the context with the given handle
mutex_lock(&pAdapter->hddWmmStatus.wmmLock);
@@ -2490,7 +2490,7 @@
{
VOS_TRACE(VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
"%s: found handle 0x%x, context %p",
- __FUNCTION__, handle, pQosContext);
+ __func__, handle, pQosContext);
status = pQosContext->lastStatus;
break;
diff --git a/CORE/HDD/src/wlan_hdd_wowl.c b/CORE/HDD/src/wlan_hdd_wowl.c
index f0b8f91..fc5fa01 100644
--- a/CORE/HDD/src/wlan_hdd_wowl.c
+++ b/CORE/HDD/src/wlan_hdd_wowl.c
@@ -76,7 +76,7 @@
static void hdd_wowl_callback( void *pContext, eHalStatus halStatus )
{
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
- "%s: Return code = (%ld)\n", __FUNCTION__, halStatus );
+ "%s: Return code = (%ld)\n", __func__, halStatus );
}
static void dump_hdd_wowl_ptrn(tSirWowlAddBcastPtrn *ptrn)
@@ -139,7 +139,7 @@
if(first_empty_slot == -1)
{
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
- "%s: Cannot add anymore patterns. No free slot!", __FUNCTION__);
+ "%s: Cannot add anymore patterns. No free slot!", __func__);
return VOS_FALSE;
}
@@ -163,7 +163,7 @@
ptrn[5] != WOWL_INTRA_PTRN_TOKENIZER)
{
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
- "%s: Malformed pattern string. Skip!\n", __FUNCTION__);
+ "%s: Malformed pattern string. Skip!\n", __func__);
ptrn += len;
goto next_ptrn;
}
@@ -180,7 +180,7 @@
localPattern.ucPatternMaskSize > WOWL_PTRN_MASK_MAX_SIZE)
{
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
- "%s: Invalid length specified. Skip!\n", __FUNCTION__);
+ "%s: Invalid length specified. Skip!\n", __func__);
ptrn += len;
goto next_ptrn;
}
@@ -190,7 +190,7 @@
if(offset >= len || ptrn[offset] != WOWL_INTRA_PTRN_TOKENIZER)
{
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
- "%s: Malformed pattern string..skip!\n", __FUNCTION__);
+ "%s: Malformed pattern string..skip!\n", __func__);
ptrn += len;
goto next_ptrn;
}
@@ -200,7 +200,7 @@
if(offset+1 != len) //offset begins with 0
{
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
- "%s: Malformed pattern string...skip!\n", __FUNCTION__);
+ "%s: Malformed pattern string...skip!\n", __func__);
ptrn += len;
goto next_ptrn;
}
@@ -233,7 +233,7 @@
if(g_hdd_wowl_ptrns[first_empty_slot] == NULL)
{
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
- "%s: kmalloc failure", __FUNCTION__);
+ "%s: kmalloc failure", __func__);
return VOS_FALSE;
}
diff --git a/CORE/MAC/src/include/sirDebug.h b/CORE/MAC/src/include/sirDebug.h
index 93ea8f8..e258677 100644
--- a/CORE/MAC/src/include/sirDebug.h
+++ b/CORE/MAC/src/include/sirDebug.h
@@ -124,7 +124,7 @@
#endif /* WLAN_MDM_CODE_REDUCTION_OPT */
#define FL(x) "%s: %d: "\
- x, __FUNCTION__, __LINE__
+ x, __func__, __LINE__
#define MAC_ADDR_ARRAY(a) (a)[0], (a)[1], (a)[2], (a)[3], (a)[4], (a)[5]
#define MAC_ADDRESS_STR "%02x:%02x:%02x:%02x:%02x:%02x"
diff --git a/CORE/MAC/src/pe/lim/limFT.c b/CORE/MAC/src/pe/lim/limFT.c
index 90f941d..c5ae0f8 100644
--- a/CORE/MAC/src/pe/lim/limFT.c
+++ b/CORE/MAC/src/pe/lim/limFT.c
@@ -69,7 +69,7 @@
{
#if defined WLAN_FEATURE_VOWIFI_11R_DEBUG
PELOGE(limLog( pMac, LOGE, "%s: Freeing pFTPreAuthReq= %p\n",
- __FUNCTION__, pMac->ft.ftPEContext.pFTPreAuthReq);)
+ __func__, pMac->ft.ftPEContext.pFTPreAuthReq);)
#endif
vos_mem_free(pMac->ft.ftPEContext.pFTPreAuthReq);
pMac->ft.ftPEContext.pFTPreAuthReq = NULL;
@@ -81,7 +81,7 @@
{
#if defined WLAN_FEATURE_VOWIFI_11R_DEBUG
PELOGE(limLog( pMac, LOGE, "%s: Setting psavedsessionEntry= %p to NULL\n",
- __FUNCTION__, pMac->ft.ftPEContext.psavedsessionEntry);)
+ __func__, pMac->ft.ftPEContext.psavedsessionEntry);)
#endif
pMac->ft.ftPEContext.psavedsessionEntry = NULL;
}
@@ -99,7 +99,7 @@
pMac->ft.ftPEContext.pftSessionEntry = NULL;
#if defined WLAN_FEATURE_VOWIFI_11R_DEBUG
PELOGE(limLog( pMac, LOGE, "%s: Setting psavedsessionEntry= %p to NULL\n",
- __FUNCTION__, pMac->ft.ftPEContext.psavedsessionEntry);)
+ __func__, pMac->ft.ftPEContext.psavedsessionEntry);)
#endif
}
@@ -128,7 +128,7 @@
{
#if defined WLAN_FEATURE_VOWIFI_11R_DEBUG
PELOGE(limLog( pMac, LOGE, "%s: Freeing pFTPreAuthReq= %p\n",
- __FUNCTION__, pMac->ft.ftPEContext.pFTPreAuthReq);)
+ __func__, pMac->ft.ftPEContext.pFTPreAuthReq);)
#endif
vos_mem_free(pMac->ft.ftPEContext.pFTPreAuthReq);
pMac->ft.ftPEContext.pFTPreAuthReq = NULL;
@@ -140,7 +140,7 @@
{
#if defined WLAN_FEATURE_VOWIFI_11R_DEBUG
PELOGE(limLog( pMac, LOGE, "%s: Setting psavedsessionEntry= %p to NULL\n",
- __FUNCTION__, pMac->ft.ftPEContext.psavedsessionEntry);)
+ __func__, pMac->ft.ftPEContext.psavedsessionEntry);)
#endif
pMac->ft.ftPEContext.psavedsessionEntry = NULL;
}
@@ -152,7 +152,7 @@
/* Cannot delete sessions across associations */
#if defined WLAN_FEATURE_VOWIFI_11R_DEBUG
PELOGE(limLog( pMac, LOGE, "%s: Deleting session = %p \n",
- __FUNCTION__, pMac->ft.ftPEContext.pftSessionEntry);)
+ __func__, pMac->ft.ftPEContext.pftSessionEntry);)
#endif
pMac->ft.ftPEContext.pftSessionEntry = NULL;
}
@@ -161,7 +161,7 @@
{
#if defined WLAN_FEATURE_VOWIFI_11R_DEBUG
PELOGE(limLog( pMac, LOGE, "%s: Freeing AddBssReq = %p \n",
- __FUNCTION__, pMac->ft.ftPEContext.pAddBssReq);)
+ __func__, pMac->ft.ftPEContext.pAddBssReq);)
#endif
vos_mem_free(pMac->ft.ftPEContext.pAddBssReq);
pMac->ft.ftPEContext.pAddBssReq = NULL;
@@ -172,7 +172,7 @@
{
#if defined WLAN_FEATURE_VOWIFI_11R_DEBUG
PELOGE(limLog( pMac, LOGE, "%s: Freeing AddStaReq = %p \n",
- __FUNCTION__, pMac->ft.ftPEContext.pAddStaReq);)
+ __func__, pMac->ft.ftPEContext.pAddStaReq);)
#endif
vos_mem_free(pMac->ft.ftPEContext.pAddStaReq);
pMac->ft.ftPEContext.pAddStaReq = NULL;
@@ -195,7 +195,7 @@
// The link is suspended of not ?
if (status != eHAL_STATUS_SUCCESS)
{
- PELOGE(limLog( pMac, LOGE, "%s: Returning \n", __FUNCTION__);)
+ PELOGE(limLog( pMac, LOGE, "%s: Returning \n", __func__);)
// Post the FT Pre Auth Response to SME
limPostFTPreAuthRsp(pMac, eSIR_FAILURE, NULL, 0, (tpPESession)data);
@@ -243,7 +243,7 @@
pMac->ft.ftPEContext.pFTPreAuthReq = (tpSirFTPreAuthReq)pMsg->bodyptr;
#if defined WLAN_FEATURE_VOWIFI_11R_DEBUG
- PELOGE(limLog( pMac, LOGE, "%s: PE Auth ft_ies_length=%02x%02x%02x\n", __FUNCTION__,
+ PELOGE(limLog( pMac, LOGE, "%s: PE Auth ft_ies_length=%02x%02x%02x\n", __func__,
pMac->ft.ftPEContext.pFTPreAuthReq->ft_ies[0],
pMac->ft.ftPEContext.pFTPreAuthReq->ft_ies[1],
pMac->ft.ftPEContext.pFTPreAuthReq->ft_ies[2]);)
@@ -255,7 +255,7 @@
if (psessionEntry == NULL)
{
PELOGE(limLog( pMac, LOGE, "%s: Unable to find session for the following bssid\n",
- __FUNCTION__);)
+ __func__);)
limPrintMacAddr( pMac, pMac->ft.ftPEContext.pFTPreAuthReq->currbssId, LOGE );
// Post the FT Pre Auth Response to SME
limPostFTPreAuthRsp(pMac, eSIR_FAILURE, NULL, 0, NULL);
@@ -267,14 +267,14 @@
{
// Need to suspend link only if the channels are different
PELOG2(limLog(pMac,LOG2,"%s: Performing pre-auth on different"
- " channel (session %p)\n", __FUNCTION__, psessionEntry);)
+ " channel (session %p)\n", __func__, psessionEntry);)
limSuspendLink(pMac, eSIR_CHECK_ROAMING_SCAN, FTPreAuthSuspendLinkHandler,
(tANI_U32 *)psessionEntry);
}
else
{
PELOG2(limLog(pMac,LOG2,"%s: Performing pre-auth on same"
- " channel (session %p)\n", __FUNCTION__, psessionEntry);)
+ " channel (session %p)\n", __func__, psessionEntry);)
// We are in the same channel. Perform pre-auth
limPerformFTPreAuth(pMac, eHAL_STATUS_SUCCESS, NULL, psessionEntry);
}
@@ -336,12 +336,12 @@
if(TX_SUCCESS != tx_timer_activate(&pMac->lim.limTimers.gLimFTPreAuthRspTimer))
{
#if defined WLAN_FEATURE_VOWIFI_11R_DEBUG
- PELOGE(limLog( pMac, LOGE, "%s: FT Auth Rsp Timer Start Failed\n", __FUNCTION__);)
+ PELOGE(limLog( pMac, LOGE, "%s: FT Auth Rsp Timer Start Failed\n", __func__);)
#endif
}
#if defined WLAN_FEATURE_VOWIFI_11R_DEBUG
- PELOGE(limLog( pMac, LOGE, "%s: FT Auth Rsp Timer Started\n", __FUNCTION__);)
+ PELOGE(limLog( pMac, LOGE, "%s: FT Auth Rsp Timer Started\n", __func__);)
#endif
limSendAuthMgmtFrame(pMac, &authFrame,
@@ -694,7 +694,7 @@
#if defined WLAN_FEATURE_VOWIFI_11R_DEBUG
limLog( pMac, LOGE, "%s: Regulatory max = %d, local power constraint = %d, max tx = %d",
- __FUNCTION__, regMax, localPowerConstraint, pftSessionEntry->maxTxPower );
+ __func__, regMax, localPowerConstraint, pftSessionEntry->maxTxPower );
#endif
pftSessionEntry->limRFBand = limGetRFBand(pftSessionEntry->currentOperChannel);
@@ -706,7 +706,7 @@
#if defined WLAN_FEATURE_VOWIFI_11R_DEBUG
PELOGE(limLog(pMac,LOGE,"%s:created session (%p) with id = %d\n",
- __FUNCTION__, pftSessionEntry, pftSessionEntry->peSessionId);)
+ __func__, pftSessionEntry, pftSessionEntry->peSessionId);)
#endif
palFreeMemory(pMac->hHdd, pBeaconStruct);
@@ -1374,7 +1374,7 @@
if (NULL == psessionEntry)
{
// Cant find session entry
- PELOGE(limLog(pMac, LOGE, FL("Cant find session entry for %s\n"), __FUNCTION__);)
+ PELOGE(limLog(pMac, LOGE, FL("Cant find session entry for %s\n"), __func__);)
if( pAggrQosRspMsg != NULL )
{
palFreeMemory( pMac->hHdd, (void *)pAggrQosRspMsg );
diff --git a/CORE/MAC/src/pe/lim/limLogDump.c b/CORE/MAC/src/pe/lim/limLogDump.c
index 4751e8b..d0f8e25 100644
--- a/CORE/MAC/src/pe/lim/limLogDump.c
+++ b/CORE/MAC/src/pe/lim/limLogDump.c
@@ -1268,7 +1268,7 @@
tpSirMbMsg pMBMsg;
tSirMacHTMIMOPowerSaveState state;
- p += log_sprintf( pMac,p, "%s: Verifying the Arguments\n", __FUNCTION__);
+ p += log_sprintf( pMac,p, "%s: Verifying the Arguments\n", __func__);
if ((arg1 > 3) || (arg1 == 2))
{
p += log_sprintf( pMac,p, "Invalid Argument , enter one of the valid states\n");
@@ -1323,7 +1323,7 @@
{
p += log_sprintf( pMac, p,
"\n%s: Could not find entry in DPH table for assocId = %d\n",
- __FUNCTION__,
+ __func__,
arg1 );
}
else
@@ -1331,7 +1331,7 @@
status = limPostMlmAddBAReq( pMac, pSta, (tANI_U8) arg2, (tANI_U16) arg3,psessionEntry);
p += log_sprintf( pMac, p,
"\n%s: Attempted to send an ADDBA Req to STA Index %d, for TID %d. Send Status = %s\n",
- __FUNCTION__,
+ __func__,
pSta->staIndex,
arg2,
limResultCodeStr( status ));
@@ -1353,7 +1353,7 @@
{
p += log_sprintf( pMac, p,
"\n%s: Could not find entry in DPH table for assocId = %d\n",
- __FUNCTION__,
+ __func__,
arg1 );
}
else
@@ -1363,7 +1363,7 @@
"\n%s: Attempted to send a DELBA Ind to STA Index %d, "
"as the BA \"%s\" for TID %d, with Reason code %d. "
"Send Status = %s\n",
- __FUNCTION__,
+ __func__,
pSta->staIndex,
(arg2 == 1)? "Initiator": "Recipient",
arg3, // TID
@@ -1387,7 +1387,7 @@
p += log_sprintf( pMac, p,
"\n%s: Attempted to trigger a BA Timeout Ind to STA Index %d, for TID %d, Direction %d\n",
- __FUNCTION__,
+ __func__,
arg1, // STA index
arg2, // TID
arg3 ); // BA Direction
@@ -1413,7 +1413,7 @@
{
p += log_sprintf( pMac, p,
"\n%s: Could not find entry in DPH table for assocId = %d\n",
- __FUNCTION__,
+ __func__,
arg1 );
}
else
@@ -1448,14 +1448,14 @@
tANI_U8 val;
if (arg1 > 1) {
- log_sprintf( pMac,p, "%s:Invalid Value is entered for Enable/Disable \n", __FUNCTION__ );
+ log_sprintf( pMac,p, "%s:Invalid Value is entered for Enable/Disable \n", __func__ );
arg1 &= 1;
}
val = pMac->lim.gAddBA_Declined;
if (arg2 > 7) {
- log_sprintf( pMac,p, "%s:Invalid Value is entered for Tid \n", __FUNCTION__ );
+ log_sprintf( pMac,p, "%s:Invalid Value is entered for Tid \n", __func__ );
Tid = arg2 & 0x7;
} else
Tid = arg2;
@@ -1467,9 +1467,9 @@
val &= ~(0x1 << Tid);
if (cfgSetInt(pMac, (tANI_U16)WNI_CFG_ADDBA_REQ_DECLINE, (tANI_U32) val) != eSIR_SUCCESS)
- log_sprintf( pMac,p, "%s:Config Set for ADDBA REQ Decline has failed \n", __FUNCTION__ );
+ log_sprintf( pMac,p, "%s:Config Set for ADDBA REQ Decline has failed \n", __func__ );
- log_sprintf( pMac,p, "%s:Decline value %d is being set for TID %d ,\n \tAddBA_Decline Cfg value is %d \n", __FUNCTION__ , arg1, Tid, (int) val);
+ log_sprintf( pMac,p, "%s:Decline value %d is being set for TID %d ,\n \tAddBA_Decline Cfg value is %d \n", __func__ , arg1, Tid, (int) val);
return p;
}
@@ -2297,18 +2297,18 @@
vos_mem_copy(Profile.pBssDesc->bssId, macAddr, 6);
p += log_sprintf( pMac,p, "\n ----- LIM Debug Information ----- \n");
- p += log_sprintf( pMac, p, "%s: length = %d\n", __FUNCTION__,
+ p += log_sprintf( pMac, p, "%s: length = %d\n", __func__,
(int)pMac->ft.ftSmeContext.auth_ft_ies_length);
- p += log_sprintf( pMac, p, "%s: length = %02x\n", __FUNCTION__,
+ p += log_sprintf( pMac, p, "%s: length = %02x\n", __func__,
(int)pMac->ft.ftSmeContext.auth_ft_ies[0]);
p += log_sprintf( pMac, p, "%s: Auth Req %02x %02x %02x\n",
- __FUNCTION__, pftPreAuthReq->ft_ies[0],
+ __func__, pftPreAuthReq->ft_ies[0],
pftPreAuthReq->ft_ies[1], pftPreAuthReq->ft_ies[2]);
- p += log_sprintf( pMac, p, "%s: Session %02x %02x %02x\n", __FUNCTION__,
+ p += log_sprintf( pMac, p, "%s: Session %02x %02x %02x\n", __func__,
psessionEntry->bssId[0],
psessionEntry->bssId[1], psessionEntry->bssId[2]);
- p += log_sprintf( pMac, p, "%s: Session %02x %02x %02x %p\n", __FUNCTION__,
+ p += log_sprintf( pMac, p, "%s: Session %02x %02x %02x %p\n", __func__,
pftPreAuthReq->currbssId[0],
pftPreAuthReq->currbssId[1],
pftPreAuthReq->currbssId[2], pftPreAuthReq);
diff --git a/CORE/MAC/src/pe/lim/limP2P.c b/CORE/MAC/src/pe/lim/limP2P.c
index 56c5573..dccb438 100644
--- a/CORE/MAC/src/pe/lim/limP2P.c
+++ b/CORE/MAC/src/pe/lim/limP2P.c
@@ -341,7 +341,7 @@
tx_timer_activate(&pMac->lim.limTimers.gLimRemainOnChannelTimer))
{
limLog( pMac, LOGE,
- "%s: remain on channel Timer Start Failed\n", __FUNCTION__);
+ "%s: remain on channel Timer Start Failed\n", __func__);
goto error;
}
@@ -463,7 +463,7 @@
if ( NULL == MsgRemainonChannel )
{
PELOGE(limLog( pMac, LOGP,
- "%s: No Pointer for Remain on Channel Req\n", __FUNCTION__);)
+ "%s: No Pointer for Remain on Channel Req\n", __func__);)
return;
}
diff --git a/CORE/MAC/src/pe/lim/limProcessMlmReqMessages.c b/CORE/MAC/src/pe/lim/limProcessMlmReqMessages.c
index bb5ab99..1279f8c 100644
--- a/CORE/MAC/src/pe/lim/limProcessMlmReqMessages.c
+++ b/CORE/MAC/src/pe/lim/limProcessMlmReqMessages.c
@@ -267,13 +267,13 @@
{
if( NULL == callback )
{
- limLog( pMac, LOGE, "%s:%d: Invalid parameters\n", __FUNCTION__, __LINE__ );
+ limLog( pMac, LOGE, "%s:%d: Invalid parameters\n", __func__, __LINE__ );
return;
}
if( pMac->lim.gpLimSuspendCallback )
{
- limLog( pMac, LOGE, "%s:%d: gLimSuspendLink callback is not NULL...something is wrong\n", __FUNCTION__, __LINE__ );
+ limLog( pMac, LOGE, "%s:%d: gLimSuspendLink callback is not NULL...something is wrong\n", __func__, __LINE__ );
callback( pMac, eHAL_STATUS_FAILURE, data );
return;
}
@@ -308,13 +308,13 @@
{
if( NULL == callback )
{
- limLog( pMac, LOGE, "%s:%d: Invalid parameters\n", __FUNCTION__, __LINE__ );
+ limLog( pMac, LOGE, "%s:%d: Invalid parameters\n", __func__, __LINE__ );
return;
}
if( pMac->lim.gpLimResumeCallback )
{
- limLog( pMac, LOGE, "%s:%d: gLimResumeLink callback is not NULL...something is wrong\n", __FUNCTION__, __LINE__ );
+ limLog( pMac, LOGE, "%s:%d: gLimResumeLink callback is not NULL...something is wrong\n", __func__, __LINE__ );
callback( pMac, eHAL_STATUS_FAILURE, data );
return;
}
diff --git a/CORE/SAP/src/sapApiLinkCntl.c b/CORE/SAP/src/sapApiLinkCntl.c
index 96d09e5..26d879b 100644
--- a/CORE/SAP/src/sapApiLinkCntl.c
+++ b/CORE/SAP/src/sapApiLinkCntl.c
@@ -143,13 +143,13 @@
/*- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -*/
- VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, before switch on scanStatus = %d", __FUNCTION__, scanStatus);
+ VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, before switch on scanStatus = %d", __func__, scanStatus);
switch (scanStatus)
{
case eCSR_SCAN_SUCCESS:
// sapScanCompleteCallback with eCSR_SCAN_SUCCESS
- VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, CSR scanStatus = %s (%d)", __FUNCTION__, "eCSR_SCAN_SUCCESS", scanStatus);
+ VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, CSR scanStatus = %s (%d)", __func__, "eCSR_SCAN_SUCCESS", scanStatus);
// Get scan results, Run channel selection algorithm, select channel and keep in pSapContext->Channel
scanGetResultStatus = sme_ScanGetResult(halHandle, 0, NULL, &pResult);
@@ -157,7 +157,7 @@
if ((NULL == pResult) || (scanGetResultStatus != eHAL_STATUS_SUCCESS))
{
// No scan results
- VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR, "In %s, sme_ScanGetResult = NULL", __FUNCTION__);
+ VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR, "In %s, sme_ScanGetResult = NULL", __func__);
break;
}
@@ -167,7 +167,7 @@
break;
default:
- VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, CSR scanStatus = %s (%d)", __FUNCTION__, "eCSR_SCAN_ABORT/FAILURE", scanStatus);
+ VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, CSR scanStatus = %s (%d)", __func__, "eCSR_SCAN_ABORT/FAILURE", scanStatus);
}
if (operChannel == SAP_CHANNEL_NOT_SELECTED)
@@ -208,7 +208,7 @@
}
#endif
- VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, Channel selected = %d", __FUNCTION__, psapContext->channel);
+ VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, Channel selected = %d", __func__, psapContext->channel);
/* Fill in the event structure */
sapEvent.event = eSAP_MAC_SCAN_COMPLETE;
@@ -264,7 +264,7 @@
VOS_STATUS vosStatus = VOS_STATUS_SUCCESS;
eHalStatus halStatus = eHAL_STATUS_SUCCESS;
- VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, before switch on roamStatus = %d\n", __FUNCTION__, roamStatus);
+ VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, before switch on roamStatus = %d\n", __func__, roamStatus);
switch(roamStatus)
{
case eCSR_ROAM_SESSION_OPENED:
@@ -275,13 +275,13 @@
if (NULL == hHal)
{
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR,
- "In %s invalid hHal", __FUNCTION__);
+ "In %s invalid hHal", __func__);
halStatus = eHAL_STATUS_FAILED_ALLOC;
}
else
{
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
- "In %s calling sme_RoamConnect with eCSR_BSS_TYPE_INFRA_AP", __FUNCTION__);
+ "In %s calling sme_RoamConnect with eCSR_BSS_TYPE_INFRA_AP", __func__);
sapContext->isSapSessionOpen = eSAP_TRUE;
halStatus = sme_RoamConnect(hHal, sapContext->sessionId,
&sapContext->csrRoamProfile,
@@ -292,7 +292,7 @@
case eCSR_ROAM_INFRA_IND:
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, CSR roamStatus = %s (%d)\n",
- __FUNCTION__, "eCSR_ROAM_INFRA_IND", roamStatus);
+ __func__, "eCSR_ROAM_INFRA_IND", roamStatus);
if(roamResult == eCSR_ROAM_RESULT_INFRA_START_FAILED)
{
/* Fill in the event structure */
@@ -312,17 +312,17 @@
case eCSR_ROAM_LOSTLINK:
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, CSR roamStatus = %s (%d)\n",
- __FUNCTION__, "eCSR_ROAM_LOSTLINK", roamStatus);
+ __func__, "eCSR_ROAM_LOSTLINK", roamStatus);
break;
case eCSR_ROAM_MIC_ERROR_IND:
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, CSR roamStatus = %s (%d)\n",
- __FUNCTION__, "eCSR_ROAM_MIC_ERROR_IND", roamStatus);
+ __func__, "eCSR_ROAM_MIC_ERROR_IND", roamStatus);
break;
case eCSR_ROAM_SET_KEY_COMPLETE:
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, CSR roamStatus = %s (%d)\n",
- __FUNCTION__, "eCSR_ROAM_SET_KEY_COMPLETE", roamStatus);
+ __func__, "eCSR_ROAM_SET_KEY_COMPLETE", roamStatus);
if (roamResult == eCSR_ROAM_RESULT_FAILURE )
{
/* Format the SET KEY complete information pass to HDD... */
@@ -332,7 +332,7 @@
case eCSR_ROAM_REMOVE_KEY_COMPLETE:
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, CSR roamStatus = %s (%d)\n",
- __FUNCTION__, "eCSR_ROAM_REMOVE_KEY_COMPLETE", roamStatus);
+ __func__, "eCSR_ROAM_REMOVE_KEY_COMPLETE", roamStatus);
if (roamResult == eCSR_ROAM_RESULT_FAILURE )
{
/* Format the SET KEY complete information pass to HDD... */
@@ -342,7 +342,7 @@
case eCSR_ROAM_ASSOCIATION_COMPLETION:
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, CSR roamStatus = %s (%d)\n",
- __FUNCTION__, "eCSR_ROAM_ASSOCIATION_COMPLETION", roamStatus);
+ __func__, "eCSR_ROAM_ASSOCIATION_COMPLETION", roamStatus);
if (roamResult == eCSR_ROAM_RESULT_FAILURE )
{
/* Format the SET KEY complete information pass to HDD... */
@@ -352,7 +352,7 @@
case eCSR_ROAM_DISASSOCIATED:
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, CSR roamStatus = %s (%d)\n",
- __FUNCTION__, "eCSR_ROAM_DISASSOCIATED", roamStatus);
+ __func__, "eCSR_ROAM_DISASSOCIATED", roamStatus);
if (roamResult == eCSR_ROAM_RESULT_MIC_FAILURE)
{
/* Format the MIC failure event to return... */
@@ -362,7 +362,7 @@
case eCSR_ROAM_WPS_PBC_PROBE_REQ_IND:
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, CSR roamStatus = %s (%d)\n",
- __FUNCTION__, "eCSR_ROAM_WPS_PBC_PROBE_REQ_IND", roamStatus);
+ __func__, "eCSR_ROAM_WPS_PBC_PROBE_REQ_IND", roamStatus);
break;
#ifdef WLAN_FEATURE_P2P
@@ -386,19 +386,19 @@
default:
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR, "In %s, CSR roamStatus not handled roamStatus = %s (%d)\n",
- __FUNCTION__, get_eRoamCmdStatus_str(roamStatus), roamStatus);
+ __func__, get_eRoamCmdStatus_str(roamStatus), roamStatus);
break;
}
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, before switch on roamResult = %d\n",
- __FUNCTION__, roamResult);
+ __func__, roamResult);
switch (roamResult)
{
case eCSR_ROAM_RESULT_INFRA_ASSOCIATION_IND:
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, CSR roamResult = %s (%d)\n",
- __FUNCTION__, "eCSR_ROAM_RESULT_INFRA_ASSOCIATION_IND", roamResult);
+ __func__, "eCSR_ROAM_RESULT_INFRA_ASSOCIATION_IND", roamResult);
sapContext->nStaWPARSnReqIeLength = pCsrRoamInfo->rsnIELen;
if(sapContext->nStaWPARSnReqIeLength)
@@ -423,7 +423,7 @@
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR,
"In %s, CSR roamResult = (%d) MAC"
"(%02X-%02X-%02X-%02X-%02X-%02X) fail",
- __FUNCTION__, roamResult, pCsrRoamInfo->peerMac[0],
+ __func__, roamResult, pCsrRoamInfo->peerMac[0],
pCsrRoamInfo->peerMac[1], pCsrRoamInfo->peerMac[2],
pCsrRoamInfo->peerMac[3], pCsrRoamInfo->peerMac[4],
pCsrRoamInfo->peerMac[5]);
@@ -435,7 +435,7 @@
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_WARN,
"In %s, CSR roamResult = (%d) MAC"
"(%02X-%02X-%02X-%02X-%02X-%02X) not allowed",
- __FUNCTION__, roamResult, pCsrRoamInfo->peerMac[0],
+ __func__, roamResult, pCsrRoamInfo->peerMac[0],
pCsrRoamInfo->peerMac[1], pCsrRoamInfo->peerMac[2],
pCsrRoamInfo->peerMac[3], pCsrRoamInfo->peerMac[4], pCsrRoamInfo->peerMac[5]);
halStatus = eHAL_STATUS_FAILURE;
@@ -445,7 +445,7 @@
case eCSR_ROAM_RESULT_INFRA_ASSOCIATION_CNF:
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, CSR roamResult = %s (%d)\n",
- __FUNCTION__, "eCSR_ROAM_RESULT_INFRA_ASSOCIATION_CNF", roamResult);
+ __func__, "eCSR_ROAM_RESULT_INFRA_ASSOCIATION_CNF", roamResult);
sapContext->nStaWPARSnReqIeLength = pCsrRoamInfo->rsnIELen;
if (sapContext->nStaWPARSnReqIeLength)
@@ -468,7 +468,7 @@
case eCSR_ROAM_RESULT_DISASSOC_IND:
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, CSR roamResult = %s (%d)\n",
- __FUNCTION__, "eCSR_ROAM_RESULT_DISASSOC_IND", roamResult);
+ __func__, "eCSR_ROAM_RESULT_DISASSOC_IND", roamResult);
/* Fill in the event structure */
vosStatus = sapSignalHDDevent( sapContext, pCsrRoamInfo, eSAP_STA_DISASSOC_EVENT, (v_PVOID_t)eSAP_STATUS_SUCCESS);
if(!VOS_IS_STATUS_SUCCESS(vosStatus))
@@ -479,7 +479,7 @@
case eCSR_ROAM_RESULT_DEAUTH_IND:
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, CSR roamResult = %s (%d)\n",
- __FUNCTION__, "eCSR_ROAM_RESULT_DEAUTH_IND", roamResult);
+ __func__, "eCSR_ROAM_RESULT_DEAUTH_IND", roamResult);
/* Fill in the event structure */
//TODO: we will use the same event inorder to inform HDD to disassociate the station
vosStatus = sapSignalHDDevent( sapContext, pCsrRoamInfo, eSAP_STA_DISASSOC_EVENT, (v_PVOID_t)eSAP_STATUS_SUCCESS);
@@ -491,7 +491,7 @@
case eCSR_ROAM_RESULT_MIC_ERROR_GROUP:
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, CSR roamResult = %s (%d)\n",
- __FUNCTION__, "eCSR_ROAM_RESULT_MIC_ERROR_GROUP", roamResult);
+ __func__, "eCSR_ROAM_RESULT_MIC_ERROR_GROUP", roamResult);
/* Fill in the event structure */
//TODO: support for group key MIC failure event to be handled
vosStatus = sapSignalHDDevent( sapContext, pCsrRoamInfo, eSAP_STA_MIC_FAILURE_EVENT,(v_PVOID_t) NULL);
@@ -503,7 +503,7 @@
case eCSR_ROAM_RESULT_MIC_ERROR_UNICAST:
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, CSR roamResult = %s (%d)\n",
- __FUNCTION__, "eCSR_ROAM_RESULT_MIC_ERROR_UNICAST", roamResult);
+ __func__, "eCSR_ROAM_RESULT_MIC_ERROR_UNICAST", roamResult);
/* Fill in the event structure */
//TODO: support for unicast key MIC failure event to be handled
vosStatus = sapSignalHDDevent( sapContext, pCsrRoamInfo, eSAP_STA_MIC_FAILURE_EVENT,(v_PVOID_t) NULL);
@@ -515,7 +515,7 @@
case eCSR_ROAM_RESULT_AUTHENTICATED:
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, CSR roamResult = %s (%d)\n",
- __FUNCTION__, "eCSR_ROAM_RESULT_AUTHENTICATED", roamResult);
+ __func__, "eCSR_ROAM_RESULT_AUTHENTICATED", roamResult);
/* Fill in the event structure */
sapSignalHDDevent( sapContext, pCsrRoamInfo,eSAP_STA_SET_KEY_EVENT, (v_PVOID_t)eSAP_STATUS_SUCCESS);
if(!VOS_IS_STATUS_SUCCESS(vosStatus))
@@ -526,14 +526,14 @@
case eCSR_ROAM_RESULT_ASSOCIATED:
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, CSR roamResult = %s (%d)\n",
- __FUNCTION__, "eCSR_ROAM_RESULT_ASSOCIATED", roamResult);
+ __func__, "eCSR_ROAM_RESULT_ASSOCIATED", roamResult);
/* Fill in the event structure */
sapSignalHDDevent( sapContext, pCsrRoamInfo,eSAP_STA_REASSOC_EVENT, (v_PVOID_t)eSAP_STATUS_SUCCESS);
break;
case eCSR_ROAM_RESULT_INFRA_STARTED:
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, CSR roamResult = %s (%d)\n",
- __FUNCTION__, "eCSR_ROAM_RESULT_INFRA_STARTED", roamResult);
+ __func__, "eCSR_ROAM_RESULT_INFRA_STARTED", roamResult);
/* Fill in the event structure */
sapEvent.event = eSAP_MAC_START_BSS_SUCCESS;
sapEvent.params = pCsrRoamInfo;
@@ -550,7 +550,7 @@
case eCSR_ROAM_RESULT_INFRA_STOPPED:
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, CSR roamResult = %s (%d)\n",
- __FUNCTION__, "eCSR_ROAM_RESULT_INFRA_STOPPED", roamResult);
+ __func__, "eCSR_ROAM_RESULT_INFRA_STOPPED", roamResult);
/* Fill in the event structure */
sapEvent.event = eSAP_MAC_READY_FOR_CONNECTIONS;
sapEvent.params = pCsrRoamInfo;
@@ -567,7 +567,7 @@
case eCSR_ROAM_RESULT_WPS_PBC_PROBE_REQ_IND:
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, CSR roamResult = %s (%d)\n",
- __FUNCTION__, "eCSR_ROAM_RESULT_WPS_PBC_PROBE_REQ_IND", roamResult);
+ __func__, "eCSR_ROAM_RESULT_WPS_PBC_PROBE_REQ_IND", roamResult);
/* Fill in the event structure */
//TODO: support for group key MIC failure event to be handled
vosStatus = sapSignalHDDevent( sapContext, pCsrRoamInfo, eSAP_WPS_PBC_PROBE_REQ_EVENT,(v_PVOID_t) NULL);
@@ -579,7 +579,7 @@
case eCSR_ROAM_RESULT_FORCED:
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, CSR roamResult = %s (%d)\n",
- __FUNCTION__, "eCSR_ROAM_RESULT_FORCED", roamResult);
+ __func__, "eCSR_ROAM_RESULT_FORCED", roamResult);
//This event can be used to inform hdd about user triggered disassoc event
/* Fill in the event structure */
sapSignalHDDevent( sapContext, pCsrRoamInfo, eSAP_STA_DISASSOC_EVENT, (v_PVOID_t)eSAP_STATUS_SUCCESS);
@@ -587,7 +587,7 @@
case eCSR_ROAM_RESULT_NONE:
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, CSR roamResult = %s (%d)\n",
- __FUNCTION__, "eCSR_ROAM_RESULT_NONE", roamResult);
+ __func__, "eCSR_ROAM_RESULT_NONE", roamResult);
//This event can be used to inform hdd about user triggered disassoc event
/* Fill in the event structure */
if ( roamStatus == eCSR_ROAM_SET_KEY_COMPLETE)
@@ -602,7 +602,7 @@
case eCSR_ROAM_RESULT_MAX_ASSOC_EXCEEDED:
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, CSR roamResult = %s (%d)\n",
- __FUNCTION__, "eCSR_ROAM_RESULT_MAX_ASSOC_EXCEEDED", roamResult);
+ __func__, "eCSR_ROAM_RESULT_MAX_ASSOC_EXCEEDED", roamResult);
/* Fill in the event structure */
vosStatus = sapSignalHDDevent(sapContext, pCsrRoamInfo, eSAP_MAX_ASSOC_EXCEEDED, (v_PVOID_t)NULL);
if(!VOS_IS_STATUS_SUCCESS(vosStatus))
@@ -613,7 +613,7 @@
break;
default:
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR, "In %s, CSR roamResult = %s (%d) not handled\n",
- __FUNCTION__,get_eCsrRoamResult_str(roamResult),roamResult);
+ __func__,get_eCsrRoamResult_str(roamResult),roamResult);
break;
}
diff --git a/CORE/SAP/src/sapChSelect.c b/CORE/SAP/src/sapChSelect.c
index 0adf9d0..6f304d8 100644
--- a/CORE/SAP/src/sapChSelect.c
+++ b/CORE/SAP/src/sapChSelect.c
@@ -135,7 +135,7 @@
int j;
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
- "Enter: %s", __FUNCTION__);
+ "Enter: %s", __func__);
if (NULL != pSapCtx->SapChnlList.channelList)
{
@@ -225,7 +225,7 @@
}
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
- "Exit: %s", __FUNCTION__);
+ "Exit: %s", __func__);
return 0;
}
@@ -319,7 +319,7 @@
v_U16_t channelnum = 0;
tpAniSirGlobal pMac = PMAC_STRUCT(halHandle);
- VOS_TRACE(VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s", __FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s", __func__);
// Channels for that 2.4GHz band
//Considered only for 2.4GHz need to change in future to support 5GHz support
@@ -329,7 +329,7 @@
pSpectCh = (tSapSpectChInfo *)vos_mem_malloc((pSpectInfoParams->numSpectChans) * sizeof(*pSpectCh));
if(pSpectCh == NULL) {
- VOS_TRACE(VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR, "In %s, VOS_MALLOC_ERR", __FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR, "In %s, VOS_MALLOC_ERR", __func__);
return eSAP_FALSE;
}
@@ -402,7 +402,7 @@
rssicountWeight = rssiWeight + countWeight;
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, rssiWeight=%d, countWeight=%d, rssicountWeight=%d",
- __FUNCTION__, rssiWeight, countWeight, rssicountWeight);
+ __func__, rssiWeight, countWeight, rssicountWeight);
return(rssicountWeight);
}
@@ -440,7 +440,7 @@
tCsrScanResultInfo *pScanResult;
tSapSpectChInfo *pSpectCh = pSpectInfoParams->pSpectCh;
- VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, Computing spectral weight", __FUNCTION__);
+ VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, Computing spectral weight", __func__);
/**
* Soft AP specific channel weight calculation using DFS formula
@@ -470,7 +470,7 @@
VOS_TRACE(VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
"In %s, bssdes.ch_self=%d, bssdes.ch_ID=%d, bssdes.rssi=%d, SpectCh.bssCount=%d, pScanResult=0x%x",
- __FUNCTION__, pScanResult->BssDescriptor.channelIdSelf, pScanResult->BssDescriptor.channelId,
+ __func__, pScanResult->BssDescriptor.channelIdSelf, pScanResult->BssDescriptor.channelId,
pScanResult->BssDescriptor.rssi, pSpectCh->bssCount, pScanResult);
pSpectCh++;
@@ -486,7 +486,7 @@
// Calculate the weights for all channels in the spectrum pSpectCh
pSpectCh = pSpectInfoParams->pSpectCh;
- VOS_TRACE(VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, Spectrum Channels Weight", __FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, Spectrum Channels Weight", __func__);
for (chn_num = 0; chn_num < (pSpectInfoParams->numSpectChans); chn_num++) {
@@ -500,7 +500,7 @@
pSpectCh->weight = SAPDFS_NORMALISE_1000 * sapweightRssiCount(rssi, pSpectCh->bssCount);
//------ Debug Info ------
- VOS_TRACE(VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, Chan=%d Weight= %d rssiAgr=%d bssCount=%d", __FUNCTION__, pSpectCh->chNum,
+ VOS_TRACE(VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, Chan=%d Weight= %d rssiAgr=%d bssCount=%d", __func__, pSpectCh->chNum,
pSpectCh->weight, pSpectCh->rssiAgr, pSpectCh->bssCount);
//------ Debug Info ------
pSpectCh++;
@@ -593,11 +593,11 @@
#endif
/* For testing */
- VOS_TRACE(VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, Sorted Spectrum Channels Weight", __FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, Sorted Spectrum Channels Weight", __func__);
pSpectCh = pSpectInfoParams->pSpectCh;
for (j = 0; j < (pSpectInfoParams->numSpectChans); j++) {
VOS_TRACE(VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, Channel=%d Weight= %d rssi=%d bssCount=%d",
- __FUNCTION__, pSpectCh->chNum, pSpectCh->weight, pSpectCh->rssiAgr, pSpectCh->bssCount);
+ __func__, pSpectCh->chNum, pSpectCh->weight, pSpectCh->rssiAgr, pSpectCh->bssCount);
pSpectCh++;
}
@@ -637,14 +637,14 @@
v_U32_t operatingBand;
v_U8_t count = 0;
#endif
- VOS_TRACE(VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, Running SAP Ch Select", __FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, Running SAP Ch Select", __func__);
// Set to zero tSapChSelParams
//vos_mem_zero(&sapChSelParams, sizeof(sapChSelParams));
// Initialize the structure pointed by pSpectInfoParams
if(sapChanSelInit( halHandle, pSpectInfoParams) != eSAP_TRUE ) {
- VOS_TRACE(VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR, "In %s, Ch Select initialization failed", __FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR, "In %s, Ch Select initialization failed", __func__);
return SAP_CHANNEL_NOT_SELECTED;
}
@@ -683,7 +683,7 @@
sapChanSelExit(pSpectInfoParams);
VOS_TRACE(VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, Running SAP Ch select Completed, Ch=%d",
- __FUNCTION__, bestChNum);
+ __func__, bestChNum);
if (bestChNum > 0 && bestChNum <= 252)
return bestChNum;
diff --git a/CORE/SAP/src/sapFsm.c b/CORE/SAP/src/sapFsm.c
index 1cb9184..0d937a0 100644
--- a/CORE/SAP/src/sapFsm.c
+++ b/CORE/SAP/src/sapFsm.c
@@ -175,7 +175,7 @@
{
/* we have a serious problem */
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_FATAL,
- "In %s, invalid hHal", __FUNCTION__);
+ "In %s, invalid hHal", __func__);
return VOS_STATUS_E_FAULT;
}
@@ -229,7 +229,7 @@
#endif
/* Set requestType to Full scan */
- VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, calling sme_ScanRequest", __FUNCTION__);
+ VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, calling sme_ScanRequest", __func__);
halStatus = sme_ScanRequest(hHal,
0,//Not used in csrScanRequest
@@ -239,7 +239,7 @@
sapContext);//void * pContext scanRequestID filled up
if (eHAL_STATUS_SUCCESS != halStatus)
{
- VOS_TRACE(VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR, "%s:sme_ScanRequest fail %d!!!", __FUNCTION__, halStatus);
+ VOS_TRACE(VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR, "%s:sme_ScanRequest fail %d!!!", __func__, halStatus);
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "SoftAP Configuring for default channel, Ch= %d", sapContext->channel);
/* In case of error, switch to default channel */
sapContext->channel = SAP_DEFAULT_CHANNEL;
@@ -260,13 +260,13 @@
else
{
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, return from sme_ScanRequest, scanRequestID=%d, Ch= %d",
- __FUNCTION__, scanRequestID, sapContext->channel);
+ __func__, scanRequestID, sapContext->channel);
}
}
else
{
- VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, for configured channel, Ch= %d", __FUNCTION__, sapContext->channel);
+ VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, for configured channel, Ch= %d", __func__, sapContext->channel);
/* Fill in the event structure */
// Eventhough scan was not done, means a user set channel was chosen
sapEventInit(sapEvent);
@@ -276,7 +276,7 @@
/* If scan failed, get default channel and advance state machine as success with default channel */
/* Have to wait for the call back to be called to get the channel cannot advance state machine here as said above */
- VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, before exiting sapGotoChannelSel channel=%d", __FUNCTION__, sapContext->channel);
+ VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, before exiting sapGotoChannelSel channel=%d", __func__, sapContext->channel);
return VOS_STATUS_SUCCESS;
}// sapGotoChannelSel
@@ -323,12 +323,12 @@
sapContext->key_length = 32;
vos_mem_copy(sapContext->key_material, key_material, sizeof(key_material)); /* Need a key size define */
- VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s", __FUNCTION__);
+ VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s", __func__);
if (NULL == hHal)
{
/* we have a serious problem */
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_FATAL,
- "In %s, invalid hHal", __FUNCTION__);
+ "In %s, invalid hHal", __func__);
return VOS_STATUS_E_FAULT;
}
@@ -347,7 +347,7 @@
if(eHAL_STATUS_SUCCESS != halStatus )
{
- VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR, "Error: In %s calling sme_RoamConnect status = %d", __FUNCTION__, halStatus);
+ VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR, "Error: In %s calling sme_RoamConnect status = %d", __func__, halStatus);
return VOS_STATUS_E_FAILURE;
}
@@ -390,7 +390,7 @@
{
/* we have a serious problem */
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR,
- "In %s, invalid hHal", __FUNCTION__);
+ "In %s, invalid hHal", __func__);
return VOS_STATUS_E_FAULT;
}
@@ -398,7 +398,7 @@
halStatus = sme_RoamStopBss(hHal, sapContext->sessionId);
if(eHAL_STATUS_SUCCESS != halStatus )
{
- VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR, "Error: In %s calling sme_RoamStopBss status = %d", __FUNCTION__, halStatus);
+ VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR, "Error: In %s calling sme_RoamStopBss status = %d", __func__, halStatus);
return VOS_STATUS_E_FAILURE;
}
@@ -520,7 +520,7 @@
break;
case eSAP_START_BSS_EVENT:
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, SAP event callback event = %s",
- __FUNCTION__, "eSAP_START_BSS_EVENT");
+ __func__, "eSAP_START_BSS_EVENT");
sapApAppEvent.sapHddEventCode = eSAP_START_BSS_EVENT;
sapApAppEvent.sapevt.sapStartBssCompleteEvent.status = (eSapStatus )context;
if(pCsrRoamInfo != NULL ){
@@ -533,7 +533,7 @@
case eSAP_STOP_BSS_EVENT:
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, SAP event callback event = %s",
- __FUNCTION__, "eSAP_STOP_BSS_EVENT");
+ __func__, "eSAP_STOP_BSS_EVENT");
sapApAppEvent.sapHddEventCode = eSAP_STOP_BSS_EVENT;
sapApAppEvent.sapevt.sapStopBssCompleteEvent.status = (eSapStatus )context;
break;
@@ -541,7 +541,7 @@
case eSAP_STA_ASSOC_EVENT:
{
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, SAP event callback event = %s",
- __FUNCTION__, "eSAP_STA_ASSOC_EVENT");
+ __func__, "eSAP_STA_ASSOC_EVENT");
if (pCsrRoamInfo->fReassocReq)
sapApAppEvent.sapHddEventCode = eSAP_STA_REASSOC_EVENT;
else
@@ -574,7 +574,7 @@
case eSAP_STA_DISASSOC_EVENT:
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, SAP event callback event = %s",
- __FUNCTION__, "eSAP_STA_DISASSOC_EVENT");
+ __func__, "eSAP_STA_DISASSOC_EVENT");
sapApAppEvent.sapHddEventCode = eSAP_STA_DISASSOC_EVENT;
vos_mem_copy( &sapApAppEvent.sapevt.sapStationDisassocCompleteEvent.staMac,
@@ -591,7 +591,7 @@
case eSAP_STA_SET_KEY_EVENT:
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, SAP event callback event = %s",
- __FUNCTION__, "eSAP_STA_SET_KEY_EVENT");
+ __func__, "eSAP_STA_SET_KEY_EVENT");
sapApAppEvent.sapHddEventCode = eSAP_STA_SET_KEY_EVENT;
sapApAppEvent.sapevt.sapStationSetKeyCompleteEvent.status = (eSapStatus )context;
vos_mem_copy(&sapApAppEvent.sapevt.sapStationSetKeyCompleteEvent.peerMacAddr,
@@ -600,7 +600,7 @@
case eSAP_STA_DEL_KEY_EVENT :
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, SAP event callback event = %s",
- __FUNCTION__, "eSAP_STA_DEL_KEY_EVENT");
+ __func__, "eSAP_STA_DEL_KEY_EVENT");
sapApAppEvent.sapHddEventCode = eSAP_STA_DEL_KEY_EVENT;
sapApAppEvent.sapevt.sapStationDeleteKeyCompleteEvent.status = (eSapStatus )context;
//TODO: Should we need to send the key information
@@ -609,7 +609,7 @@
case eSAP_STA_MIC_FAILURE_EVENT :
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, SAP event callback event = %s",
- __FUNCTION__, "eSAP_STA_MIC_FAILURE_EVENT");
+ __func__, "eSAP_STA_MIC_FAILURE_EVENT");
sapApAppEvent.sapHddEventCode = eSAP_STA_MIC_FAILURE_EVENT;
vos_mem_copy( &sapApAppEvent.sapevt.sapStationMICFailureEvent.srcMacAddr,
pCsrRoamInfo->u.pMICFailureInfo->srcMacAddr,
@@ -630,7 +630,7 @@
case eSAP_ASSOC_STA_CALLBACK_EVENT:
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, SAP event callback event = %s",
- __FUNCTION__, "eSAP_ASSOC_STA_CALLBACK_EVENT");
+ __func__, "eSAP_ASSOC_STA_CALLBACK_EVENT");
break;
case eSAP_WPS_PBC_PROBE_REQ_EVENT:
@@ -645,7 +645,7 @@
case eSAP_INDICATE_MGMT_FRAME:
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
"In %s, SAP event callback event = %s",
- __FUNCTION__, "eSAP_INDICATE_MGMT_FRAME");
+ __func__, "eSAP_INDICATE_MGMT_FRAME");
sapApAppEvent.sapHddEventCode = eSAP_INDICATE_MGMT_FRAME;
sapApAppEvent.sapevt.sapManagementFrameInfo.nFrameLength
= pCsrRoamInfo->nFrameLength;
@@ -660,13 +660,13 @@
case eSAP_REMAIN_CHAN_READY:
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
"In %s, SAP event callback event = %s",
- __FUNCTION__, "eSAP_REMAIN_CHAN_READY");
+ __func__, "eSAP_REMAIN_CHAN_READY");
sapApAppEvent.sapHddEventCode = eSAP_REMAIN_CHAN_READY;
break;
case eSAP_SEND_ACTION_CNF:
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
"In %s, SAP event callback event = %s",
- __FUNCTION__, "eSAP_SEND_ACTION_CNF");
+ __func__, "eSAP_SEND_ACTION_CNF");
sapApAppEvent.sapHddEventCode = eSAP_SEND_ACTION_CNF;
sapApAppEvent.sapevt.sapActionCnf.actionSendSuccess = (eSapStatus)context;
break;
@@ -675,7 +675,7 @@
case eSAP_UNKNOWN_STA_JOIN:
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
"In %s, SAP event callback event = %s",
- __FUNCTION__, "eSAP_UNKNOWN_STA_JOIN");
+ __func__, "eSAP_UNKNOWN_STA_JOIN");
sapApAppEvent.sapHddEventCode = eSAP_UNKNOWN_STA_JOIN;
vos_mem_copy((v_PVOID_t)sapApAppEvent.sapevt.sapUnknownSTAJoin.macaddr.bytes,
(v_PVOID_t)context, sizeof(v_MACADDR_t));
@@ -684,7 +684,7 @@
case eSAP_MAX_ASSOC_EXCEEDED:
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
"In %s, SAP event callback event = %s",
- __FUNCTION__, "eSAP_MAX_ASSOC_EXCEEDED");
+ __func__, "eSAP_MAX_ASSOC_EXCEEDED");
sapApAppEvent.sapHddEventCode = eSAP_MAX_ASSOC_EXCEEDED;
vos_mem_copy((v_PVOID_t)sapApAppEvent.sapevt.sapMaxAssocExceeded.macaddr.bytes,
(v_PVOID_t)pCsrRoamInfo->peerMac, sizeof(v_MACADDR_t));
@@ -692,7 +692,7 @@
default:
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR, "In %s, SAP Unknown callback event = %d",
- __FUNCTION__,sapHddevent);
+ __func__,sapHddevent);
break;
}
vosStatus = (*sapContext->pfnSapEventCallback)
@@ -750,13 +750,13 @@
{
/* Transition from eSAP_DISCONNECTED to eSAP_CH_SELECT (both without substates) */
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, new from state %s => %s",
- __FUNCTION__, "eSAP_DISCONNECTED", "eSAP_CH_SELECT");
+ __func__, "eSAP_DISCONNECTED", "eSAP_CH_SELECT");
/* There can be one SAP Session for softap */
if (sapContext->isSapSessionOpen == eSAP_TRUE)
{
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_FATAL,
- "%s:SME Session is already opened\n",__FUNCTION__);
+ "%s:SME Session is already opened\n",__func__);
return VOS_STATUS_E_EXISTS;
}
@@ -770,12 +770,12 @@
/* Transition from eSAP_DISCONNECTED to eSAP_CH_SELECT (both without substates) */
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s",
- __FUNCTION__, "eSAP_DISCONNECTED", "eSAP_CH_SELECT");
+ __func__, "eSAP_DISCONNECTED", "eSAP_CH_SELECT");
}
else
{
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR, "In %s, in state %s, event msg %d",
- __FUNCTION__, "eSAP_DISCONNECTED", msg);
+ __func__, "eSAP_DISCONNECTED", msg);
}
break;
@@ -784,7 +784,7 @@
{
/* Transition from eSAP_CH_SELECT to eSAP_STARTING (both without substates) */
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s",
- __FUNCTION__, "eSAP_CH_SELECT", "eSAP_STARTING");
+ __func__, "eSAP_CH_SELECT", "eSAP_STARTING");
// Channel selected. Now can sapGotoStarting
sapContext->sapsMachine = eSAP_STARTING;
// Specify the channel
@@ -794,12 +794,12 @@
vosStatus = sapGotoStarting( sapContext, sapEvent, eCSR_BSS_TYPE_INFRA_AP);
/* Transition from eSAP_CH_SELECT to eSAP_STARTING (both without substates) */
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s",
- __FUNCTION__, "eSAP_CH_SELECT", "eSAP_STARTING");
+ __func__, "eSAP_CH_SELECT", "eSAP_STARTING");
}
else
{
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR, "In %s, in state %s, invalid event msg %d",
- __FUNCTION__, "eSAP_CH_SELECT", msg);
+ __func__, "eSAP_CH_SELECT", msg);
}
break;
@@ -808,7 +808,7 @@
{
/* Transition from eSAP_STARTING to eSAP_STARTED (both without substates) */
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state channel = %d %s => %s",
- __FUNCTION__,sapContext->channel, "eSAP_STARTING", "eSAP_STARTED");
+ __func__,sapContext->channel, "eSAP_STARTING", "eSAP_STARTED");
sapContext->sapsMachine = eSAP_STARTED;
/*Action code for transition */
@@ -816,13 +816,13 @@
/* Transition from eSAP_STARTING to eSAP_STARTED (both without substates) */
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s",
- __FUNCTION__, "eSAP_STARTING", "eSAP_STARTED");
+ __func__, "eSAP_STARTING", "eSAP_STARTED");
}
else if (msg == eSAP_MAC_START_FAILS)
{
/*Transition from STARTING to DISCONNECTED (both without substates)*/
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s",
- __FUNCTION__, "eSAP_STARTING", "eSAP_DISCONNECTED");
+ __func__, "eSAP_STARTING", "eSAP_DISCONNECTED");
/*Action code for transition */
vosStatus = sapSignalHDDevent( sapContext, NULL, eSAP_START_BSS_EVENT,(v_PVOID_t) eSAP_STATUS_FAILURE);
@@ -835,7 +835,7 @@
{
/*Transition from eSAP_STARTING to eSAP_DISCONNECTING (both without substates)*/
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s",
- __FUNCTION__, "eSAP_STARTING", "eSAP_DISCONNECTING");
+ __func__, "eSAP_STARTING", "eSAP_DISCONNECTING");
/*Advance outer statevar */
sapContext->sapsMachine = eSAP_DISCONNECTED;
@@ -850,7 +850,7 @@
{
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR,
"In %s, NULL hHal in state %s, msg %d",
- __FUNCTION__, "eSAP_STARTING", msg);
+ __func__, "eSAP_STARTING", msg);
}
else if (eHAL_STATUS_SUCCESS ==
sme_CloseSession(hHal,
@@ -864,7 +864,7 @@
{
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR,
"In %s, in state %s, invalid event msg %d",
- __FUNCTION__, "eSAP_STARTING", msg);
+ __func__, "eSAP_STARTING", msg);
/* Intentionally left blank */
}
break;
@@ -874,14 +874,14 @@
{
/* Transition from eSAP_STARTED to eSAP_DISCONNECTING (both without substates) */
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s",
- __FUNCTION__, "eSAP_STARTED", "eSAP_DISCONNECTING");
+ __func__, "eSAP_STARTED", "eSAP_DISCONNECTING");
sapContext->sapsMachine = eSAP_DISCONNECTING;
vosStatus = sapGotoDisconnecting(sapContext);
}
else
{
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR, "In %s, in state %s, invalid event msg %d",
- __FUNCTION__, "eSAP_STARTED", msg);
+ __func__, "eSAP_STARTED", msg);
}
break;
@@ -890,7 +890,7 @@
{
/* Transition from eSAP_DISCONNECTING to eSAP_DISCONNECTED (both without substates) */
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s",
- __FUNCTION__, "eSAP_DISCONNECTING", "eSAP_DISCONNECTED");
+ __func__, "eSAP_DISCONNECTING", "eSAP_DISCONNECTED");
sapContext->sapsMachine = eSAP_DISCONNECTED;
/* Close the SME session*/
@@ -902,7 +902,7 @@
{
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR,
"In %s, NULL hHal in state %s, msg %d",
- __FUNCTION__, "eSAP_DISCONNECTING", msg);
+ __func__, "eSAP_DISCONNECTING", msg);
}
else
{
@@ -923,7 +923,7 @@
{
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR,
"In %s, in state %s, invalid event msg %d",
- __FUNCTION__, "eSAP_DISCONNECTING", msg);
+ __func__, "eSAP_DISCONNECTING", msg);
}
break;
}
@@ -1007,7 +1007,7 @@
profile->pRSNReqIE = vos_mem_malloc(pconfig_params->RSNWPAReqIELength);
if( NULL == profile->pRSNReqIE )
{
- VOS_TRACE(VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR, " %s Fail to alloc memory", __FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR, " %s Fail to alloc memory", __func__);
return eSAP_STATUS_FAILURE;
}
vos_mem_copy(profile->pRSNReqIE, pconfig_params->pRSNWPAReqIE, pconfig_params->RSNWPAReqIELength);
@@ -1191,7 +1191,7 @@
if (sapSearchMacList(sapContext->denyMacList, sapContext->nDenyMac, peerMac, NULL))
{
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, Peer %02x:%02x:%02x:%02x:%02x:%02x in deny list",
- __FUNCTION__, *peerMac, *(peerMac + 1), *(peerMac + 2), *(peerMac + 3), *(peerMac + 4), *(peerMac + 5));
+ __func__, *peerMac, *(peerMac + 1), *(peerMac + 2), *(peerMac + 3), *(peerMac + 4), *(peerMac + 5));
return VOS_STATUS_E_FAILURE;
}
@@ -1203,7 +1203,7 @@
if (eSAP_DENY_UNLESS_ACCEPTED == sapContext->eSapMacAddrAclMode)
{
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, Peer %02x:%02x:%02x:%02x:%02x:%02x denied, Mac filter mode is eSAP_DENY_UNLESS_ACCEPTED",
- __FUNCTION__, *peerMac, *(peerMac + 1), *(peerMac + 2), *(peerMac + 3), *(peerMac + 4), *(peerMac + 5));
+ __func__, *peerMac, *(peerMac + 1), *(peerMac + 2), *(peerMac + 3), *(peerMac + 4), *(peerMac + 5));
return VOS_STATUS_E_FAILURE;
}
@@ -1214,7 +1214,7 @@
{
sapSignalHDDevent(sapContext, NULL, eSAP_UNKNOWN_STA_JOIN, (v_PVOID_t)peerMac);
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, Peer %02x:%02x:%02x:%02x:%02x:%02x denied, Mac filter mode is eSAP_SUPPORT_ACCEPT_AND_DENY",
- __FUNCTION__, *peerMac, *(peerMac + 1), *(peerMac + 2), *(peerMac + 3), *(peerMac + 4), *(peerMac + 5));
+ __func__, *peerMac, *(peerMac + 1), *(peerMac + 2), *(peerMac + 3), *(peerMac + 4), *(peerMac + 5));
return VOS_STATUS_E_FAILURE;
}
return VOS_STATUS_SUCCESS;
@@ -1251,7 +1251,7 @@
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO,
"%s:sapGetChannelList: startChannel %d,EndChannel %d,Operatingband:%d",
- __FUNCTION__,startChannelNum,endChannelNum,operatingBand);
+ __func__,startChannelNum,endChannelNum,operatingBand);
switch(operatingBand)
{
@@ -1295,7 +1295,7 @@
if (NULL == list)
{
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR,
- "%s: Unable to allocate channel list", __FUNCTION__);
+ "%s: Unable to allocate channel list", __func__);
*numberOfChannels = 0;
*channelList = NULL;
return VOS_STATUS_E_RESOURCES;
diff --git a/CORE/SAP/src/sapModule.c b/CORE/SAP/src/sapModule.c
index 353e155..4f09529 100644
--- a/CORE/SAP/src/sapModule.c
+++ b/CORE/SAP/src/sapModule.c
@@ -155,7 +155,7 @@
if (NULL == pSapCtx)
{
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR,
- "%s: Invalid SAP pointer from pvosGCtx", __FUNCTION__);
+ "%s: Invalid SAP pointer from pvosGCtx", __func__);
return VOS_STATUS_E_FAULT;
}
@@ -228,7 +228,7 @@
if ( NULL == pSapCtx )
{
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR,
- "%s: Invalid SAP pointer from pvosGCtx", __FUNCTION__);
+ "%s: Invalid SAP pointer from pvosGCtx", __func__);
return VOS_STATUS_E_FAULT;
}
@@ -314,7 +314,7 @@
if (NULL == pSapCtx)
{
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR,
- "%s: Invalid SAP pointer from pvosGCtx", __FUNCTION__);
+ "%s: Invalid SAP pointer from pvosGCtx", __func__);
return VOS_STATUS_E_FAULT;
}
@@ -379,7 +379,7 @@
if (NULL == pSapCtx)
{
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR,
- "%s: Invalid SAP pointer from pvosGCtx", __FUNCTION__);
+ "%s: Invalid SAP pointer from pvosGCtx", __func__);
return VOS_STATUS_E_FAULT;
}
@@ -441,7 +441,7 @@
if (NULL == pSapCtx)
{
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR,
- "%s: Invalid SAP pointer", __FUNCTION__);
+ "%s: Invalid SAP pointer", __func__);
return VOS_STATUS_E_FAULT;
}
@@ -457,7 +457,7 @@
pSapCtx->sapsMachine= eSAP_DISCONNECTED;
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s: Initializing State: %d, sapContext value = %x",
- __FUNCTION__, pSapCtx->sapsMachine, pSapCtx);
+ __func__, pSapCtx->sapsMachine, pSapCtx);
pSapCtx->sessionId = 0;
pSapCtx->channel = 0;
@@ -532,7 +532,7 @@
if ( NULL == pSapCtx )
{
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
- "%s: Invalid SAP pointer from pvosGCtx", __FUNCTION__);
+ "%s: Invalid SAP pointer from pvosGCtx", __func__);
return VOS_STATUS_E_FAULT;
}
return pSapCtx->sapsMachine;
@@ -594,7 +594,7 @@
if ( NULL == pSapCtx )
{
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
- "%s: Invalid SAP pointer from pvosGCtx", __FUNCTION__);
+ "%s: Invalid SAP pointer from pvosGCtx", __func__);
return VOS_STATUS_E_FAULT;
}
pSapCtx->sapsMachine = eSAP_DISCONNECTED;
@@ -621,7 +621,7 @@
if (NULL == hHal)
{
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
- "%s: Invalid MAC context from pvosGCtx", __FUNCTION__);
+ "%s: Invalid MAC context from pvosGCtx", __func__);
}
else
{
@@ -710,7 +710,7 @@
if ( NULL == pvosGCtx )
{
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR,
- "%s: Invalid Global VOSS handle", __FUNCTION__);
+ "%s: Invalid Global VOSS handle", __func__);
return VOS_STATUS_E_FAULT;
}
@@ -719,7 +719,7 @@
if (NULL == pSapCtx )
{
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR,
- "%s: Invalid SAP pointer from pvosGCtx", __FUNCTION__);
+ "%s: Invalid SAP pointer from pvosGCtx", __func__);
return VOS_STATUS_E_FAULT;
}
@@ -777,7 +777,7 @@
if (NULL == pSapCtx)
{
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR,
- "%s: Invalid SAP pointer from pvosGCtx", __FUNCTION__);
+ "%s: Invalid SAP pointer from pvosGCtx", __func__);
return VOS_STATUS_E_FAULT;
}
@@ -831,7 +831,7 @@
if (NULL == pSapCtx)
{
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR,
- "%s: Invalid SAP pointer from pvosGCtx", __FUNCTION__);
+ "%s: Invalid SAP pointer from pvosGCtx", __func__);
return VOS_STATUS_E_FAULT;
}
@@ -881,7 +881,7 @@
if (NULL == pSapCtx)
{
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR,
- "%s: Invalid SAP pointer from pvosGCtx", __FUNCTION__);
+ "%s: Invalid SAP pointer from pvosGCtx", __func__);
return VOS_STATUS_E_FAULT;
}
@@ -903,7 +903,7 @@
if (NULL == pSapCtx)
{
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR,
- "%s: Invalid SAP pointer from pvosGCtx", __FUNCTION__);
+ "%s: Invalid SAP pointer from pvosGCtx", __func__);
return VOS_STATUS_E_FAULT;
}
@@ -965,7 +965,7 @@
if (NULL == pSapCtx)
{
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR,
- "%s: Invalid SAP Context", __FUNCTION__);
+ "%s: Invalid SAP Context", __func__);
return VOS_STATUS_E_FAULT;
}
@@ -1174,7 +1174,7 @@
if (NULL == pSapCtx)
{
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR,
- "%s: Invalid SAP pointer from pvosGCtx", __FUNCTION__);
+ "%s: Invalid SAP pointer from pvosGCtx", __func__);
return VOS_STATUS_E_FAULT;
}
@@ -1223,7 +1223,7 @@
if (NULL == pSapCtx)
{
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR,
- "%s: Invalid SAP pointer from pvosGCtx", __FUNCTION__);
+ "%s: Invalid SAP pointer from pvosGCtx", __func__);
return VOS_STATUS_E_FAULT;
}
@@ -1346,7 +1346,7 @@
{
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR,
"%s: Invalid startChannel-%d or EndChannel-%d for band -%d",
- __FUNCTION__,startChannel,endChannel,operatingBand);
+ __func__,startChannel,endChannel,operatingBand);
/* Supplied channels are nt in the operating band so set the default
channels for the given operating band */
startChannel = rfChannels[bandStartChannel].channelNum;
@@ -1370,7 +1370,7 @@
{
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR,
"%s-No active channels present in the given range for the current region",
- __FUNCTION__);
+ __func__);
/* There is no active channel in the supplied range.Updating the config
with the default channels in the given band so that we can select the best channel in the sub-band*/
startChannel = rfChannels[bandStartChannel].channelNum;
@@ -1451,7 +1451,7 @@
if (NULL == pSapCtx)
{
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR,
- "%s: Invalid SAP pointer from pvosGCtx", __FUNCTION__);
+ "%s: Invalid SAP pointer from pvosGCtx", __func__);
return VOS_STATUS_E_FAULT;
}
@@ -1501,14 +1501,14 @@
if (NULL == pSapCtx)
{
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR,
- "%s: Invalid SAP pointer from pvosGCtx", __FUNCTION__);
+ "%s: Invalid SAP pointer from pvosGCtx", __func__);
return VOS_STATUS_E_FAULT;
}
hHal = VOS_GET_HAL_CB(pSapCtx->pvosGCtx);
if (NULL == hHal)
{
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR,
- "%s: Invalid HAL pointer from pvosGCtx", __FUNCTION__);
+ "%s: Invalid HAL pointer from pvosGCtx", __func__);
return VOS_STATUS_E_FAULT;
}
halStatus = sme_RoamSetKey(hHal, pSapCtx->sessionId, pSetKeyInfo, &roamId);
@@ -1569,7 +1569,7 @@
if (NULL == pSapCtx)
{
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR,
- "%s: Invalid SAP pointer from pvosGCtx", __FUNCTION__);
+ "%s: Invalid SAP pointer from pvosGCtx", __func__);
return VOS_STATUS_E_FAULT;
}
@@ -1577,7 +1577,7 @@
if (NULL == hHal)
{
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR,
- "%s: Invalid HAL pointer from pvosGCtx", __FUNCTION__);
+ "%s: Invalid HAL pointer from pvosGCtx", __func__);
return VOS_STATUS_E_FAULT;
}
@@ -1617,7 +1617,7 @@
if (NULL == pSapCtx)
{
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR,
- "%s: Invalid SAP pointer from pvosGCtx", __FUNCTION__);
+ "%s: Invalid SAP pointer from pvosGCtx", __func__);
return VOS_STATUS_E_FAULT;
}
if (pLen)
@@ -1625,7 +1625,7 @@
len = *pLen;
*pLen = pSapCtx->nStaWPARSnReqIeLength;
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO,
- "%s: WPAIE len : %x", __FUNCTION__, *pLen);
+ "%s: WPAIE len : %x", __func__, *pLen);
if(pBuf)
{
if(len >= pSapCtx->nStaWPARSnReqIeLength)
@@ -1633,7 +1633,7 @@
vos_mem_copy( pBuf, pSapCtx->pStaWpaRsnReqIE, pSapCtx->nStaWPARSnReqIeLength);
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO,
"%s: WPAIE: %02x:%02x:%02x:%02x:%02x:%02x",
- __FUNCTION__,
+ __func__,
pBuf[0], pBuf[1], pBuf[2],
pBuf[3], pBuf[4], pBuf[5]);
vosStatus = VOS_STATUS_SUCCESS;
@@ -1646,7 +1646,7 @@
{
VOS_TRACE(VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR,
"%s: Error unable to populate the RSNWPAIE",
- __FUNCTION__);
+ __func__);
}
return vosStatus;
@@ -1685,21 +1685,21 @@
v_PVOID_t hHal = NULL;
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO,
- "%s, %d", __FUNCTION__, __LINE__);
+ "%s, %d", __func__, __LINE__);
if(VOS_STA_SAP_MODE == vos_get_conparam ( )) {
pSapCtx = VOS_GET_SAP_CB(pvosGCtx);
if ( NULL == pSapCtx )
{
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR,
- "%s: Invalid SAP pointer from pvosGCtx", __FUNCTION__);
+ "%s: Invalid SAP pointer from pvosGCtx", __func__);
return VOS_STATUS_E_FAULT;
}
hHal = VOS_GET_HAL_CB(pSapCtx->pvosGCtx);
if ( NULL == hHal ){
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR,
- "%s: Invalid HAL pointer from pvosGCtx", __FUNCTION__);
+ "%s: Invalid HAL pointer from pvosGCtx", __func__);
return VOS_STATUS_E_FAULT;
}
@@ -1761,21 +1761,21 @@
v_PVOID_t hHal = NULL;
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR,
- "%s, %d", __FUNCTION__, __LINE__);
+ "%s, %d", __func__, __LINE__);
if(VOS_STA_SAP_MODE == vos_get_conparam ( )){
pSapCtx = VOS_GET_SAP_CB(pvosGCtx);
if ( NULL == pSapCtx )
{
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR,
- "%s: Invalid SAP pointer from pvosGCtx", __FUNCTION__);
+ "%s: Invalid SAP pointer from pvosGCtx", __func__);
return VOS_STATUS_E_FAULT;
}
hHal = VOS_GET_HAL_CB(pSapCtx->pvosGCtx);
if ( NULL == hHal ){
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR,
- "%s: Invalid HAL pointer from pvosGCtx", __FUNCTION__);
+ "%s: Invalid HAL pointer from pvosGCtx", __func__);
return VOS_STATUS_E_FAULT;
}
@@ -1827,7 +1827,7 @@
v_PVOID_t hHal = NULL;
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO,
- "%s, %d", __FUNCTION__, __LINE__);
+ "%s, %d", __func__, __LINE__);
if(VOS_STA_SAP_MODE == vos_get_conparam ( )){
@@ -1835,14 +1835,14 @@
if ( NULL == pSapCtx )
{
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR,
- "%s: Invalid SAP pointer from pvosGCtx", __FUNCTION__);
+ "%s: Invalid SAP pointer from pvosGCtx", __func__);
return VOS_STATUS_E_FAULT;
}
hHal = VOS_GET_HAL_CB(pSapCtx->pvosGCtx);
if ( NULL == hHal ){
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR,
- "%s: Invalid HAL pointer from pvosGCtx", __FUNCTION__);
+ "%s: Invalid HAL pointer from pvosGCtx", __func__);
return VOS_STATUS_E_FAULT;
}
@@ -1932,14 +1932,14 @@
if ( NULL == pSapCtx )
{
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR,
- "%s: Invalid SAP pointer from pvosGCtx", __FUNCTION__);
+ "%s: Invalid SAP pointer from pvosGCtx", __func__);
return VOS_STATUS_E_FAULT;
}
hHal = VOS_GET_HAL_CB(pSapCtx->pvosGCtx);
if ( NULL == hHal ){
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR,
- "%s: Invalid HAL pointer from pvosGCtx", __FUNCTION__);
+ "%s: Invalid HAL pointer from pvosGCtx", __func__);
return VOS_STATUS_E_FAULT;
}
@@ -2007,7 +2007,7 @@
if (NULL == pSapCtx)
{
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR,
- "%s: Invalid SAP pointer from pvosGCtx", __FUNCTION__);
+ "%s: Invalid SAP pointer from pvosGCtx", __func__);
return VOS_STATUS_E_FAULT;
}
hHal = VOS_GET_HAL_CB(pSapCtx->pvosGCtx);
@@ -2015,7 +2015,7 @@
{
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR,
"%s: HAL pointer (%p) NULL OR SME session is not open (%d)",
- __FUNCTION__, hHal, pSapCtx->isSapSessionOpen );
+ __func__, hHal, pSapCtx->isSapSessionOpen );
return VOS_STATUS_E_FAULT;
}
@@ -2075,7 +2075,7 @@
if (NULL == pSapCtx)
{
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR,
- "%s: Invalid SAP pointer from pvosGCtx", __FUNCTION__);
+ "%s: Invalid SAP pointer from pvosGCtx", __func__);
return VOS_STATUS_E_FAULT;
}
hHal = VOS_GET_HAL_CB(pSapCtx->pvosGCtx);
@@ -2083,7 +2083,7 @@
{
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR,
"%s: HAL pointer (%p) NULL OR SME session is not open (%d)",
- __FUNCTION__, hHal, pSapCtx->isSapSessionOpen );
+ __func__, hHal, pSapCtx->isSapSessionOpen );
return VOS_STATUS_E_FAULT;
}
@@ -2136,7 +2136,7 @@
if (NULL == pSapCtx)
{
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR,
- "%s: Invalid SAP pointer from pvosGCtx", __FUNCTION__);
+ "%s: Invalid SAP pointer from pvosGCtx", __func__);
return VOS_STATUS_E_FAULT;
}
hHal = VOS_GET_HAL_CB(pSapCtx->pvosGCtx);
@@ -2144,7 +2144,7 @@
{
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR,
"%s: HAL pointer (%p) NULL OR SME session is not open (%d)",
- __FUNCTION__, hHal, pSapCtx->isSapSessionOpen );
+ __func__, hHal, pSapCtx->isSapSessionOpen );
return VOS_STATUS_E_FAULT;
}
@@ -2201,7 +2201,7 @@
if (NULL == pSapCtx)
{
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR,
- "%s: Invalid SAP pointer from pvosGCtx", __FUNCTION__);
+ "%s: Invalid SAP pointer from pvosGCtx", __func__);
return VOS_STATUS_E_FAULT;
}
hHal = VOS_GET_HAL_CB(pSapCtx->pvosGCtx);
@@ -2209,7 +2209,7 @@
{
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR,
"%s: HAL pointer (%p) NULL OR SME session is not open (%d)",
- __FUNCTION__, hHal, pSapCtx->isSapSessionOpen );
+ __func__, hHal, pSapCtx->isSapSessionOpen );
return VOS_STATUS_E_FAULT;
}
@@ -2266,7 +2266,7 @@
if (NULL == pSapCtx)
{
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR,
- "%s: Invalid SAP pointer from pvosGCtx", __FUNCTION__);
+ "%s: Invalid SAP pointer from pvosGCtx", __func__);
return VOS_STATUS_E_FAULT;
}
hHal = VOS_GET_HAL_CB(pSapCtx->pvosGCtx);
@@ -2274,7 +2274,7 @@
{
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR,
"%s: HAL pointer (%p) NULL OR SME session is not open (%d)",
- __FUNCTION__, hHal, pSapCtx->isSapSessionOpen );
+ __func__, hHal, pSapCtx->isSapSessionOpen );
return VOS_STATUS_E_FAULT;
}
diff --git a/CORE/SME/src/QoS/sme_Qos.c b/CORE/SME/src/QoS/sme_Qos.c
index 9d5006f..6a52011 100644
--- a/CORE/SME/src/QoS/sme_Qos.c
+++ b/CORE/SME/src/QoS/sme_Qos.c
@@ -519,7 +519,7 @@
eHalStatus status;
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: initializing SME-QoS module",
- __FUNCTION__, __LINE__);
+ __func__, __LINE__);
//init the control block
//(note that this will make all sessions invalid)
vos_mem_zero(&sme_QosCb, sizeof(sme_QosCb));
@@ -532,7 +532,7 @@
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_FATAL,
"%s: %d: cannot initialize Flow List",
- __FUNCTION__, __LINE__);
+ __func__, __LINE__);
return eHAL_STATUS_FAILURE;
}
@@ -548,7 +548,7 @@
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_FATAL,
"%s: %d: cannot initialize cmd list for session %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
sessionId);
return eHAL_STATUS_FAILURE;
}
@@ -562,7 +562,7 @@
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_FATAL,
"%s: %d: cannot register with pmcRegisterPowerSaveCheck()",
- __FUNCTION__, __LINE__);
+ __func__, __LINE__);
return eHAL_STATUS_FAILURE;
}
//the routine registered here gets called by PMC whenever there is a device
@@ -574,12 +574,12 @@
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_FATAL,
"%s: %d: cannot register with pmcRegisterDeviceStateUpdateInd()",
- __FUNCTION__, __LINE__);
+ __func__, __LINE__);
return eHAL_STATUS_FAILURE;
}
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: done initializing SME-QoS module",
- __FUNCTION__, __LINE__);
+ __func__, __LINE__);
return eHAL_STATUS_SUCCESS;
}
/* --------------------------------------------------------------------------
@@ -597,21 +597,21 @@
v_U8_t sessionId;
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: closing down SME-QoS",
- __FUNCTION__, __LINE__);
+ __func__, __LINE__);
// deregister with PMC
if(!HAL_STATUS_SUCCESS(
pmcDeregisterDeviceStateUpdateInd(pMac, sme_QosPmcDeviceStateUpdateInd)))
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_FATAL,
"%s: %d: cannot deregister with pmcDeregisterDeviceStateUpdateInd()",
- __FUNCTION__, __LINE__);
+ __func__, __LINE__);
}
if(!HAL_STATUS_SUCCESS(
pmcDeregisterPowerSaveCheck(pMac, sme_QosPmcCheckRoutine)))
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_FATAL,
"%s: %d: cannot deregister with pmcDeregisterPowerSaveCheck()",
- __FUNCTION__, __LINE__);
+ __func__, __LINE__);
}
//cleanup control block
//close the flow list
@@ -653,7 +653,7 @@
}
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: closed down QoS",
- __FUNCTION__, __LINE__);
+ __func__, __LINE__);
return eHAL_STATUS_SUCCESS;
}
/*--------------------------------------------------------------------------
@@ -701,14 +701,14 @@
sme_QosStatusType status;
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: QoS Setup requested by client on session %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
sessionId);
lock_status = sme_AcquireGlobalLock( &pMac->sme );
if ( !HAL_STATUS_SUCCESS( lock_status ) )
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: Unable to obtain lock",
- __FUNCTION__, __LINE__);
+ __func__, __LINE__);
return SME_QOS_STATUS_SETUP_FAILURE_RSP;
}
//Make sure the session is valid
@@ -716,7 +716,7 @@
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: Supplied Session ID %d is invalid",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
sessionId);
status = SME_QOS_STATUS_SETUP_FAILURE_RSP;
}
@@ -728,7 +728,7 @@
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: Supplied Session ID %d is inactive",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
sessionId);
status = SME_QOS_STATUS_SETUP_FAILURE_RSP;
}
@@ -738,7 +738,7 @@
*pQosFlowID = sme_QosAssignFlowId();
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: QoS request on session %d assigned Flow ID %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
sessionId, *pQosFlowID);
//Call the internal function for QoS setup,
// adding a layer of abstraction
@@ -750,7 +750,7 @@
sme_ReleaseGlobalLock( &pMac->sme );
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: QoS setup return status on session %d is %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
sessionId, status);
return status;
}
@@ -787,14 +787,14 @@
sme_QosStatusType status;
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: QoS Modify requested by client for Flow %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
QosFlowID);
lock_status = sme_AcquireGlobalLock( &pMac->sme );
if ( !HAL_STATUS_SUCCESS( lock_status ) )
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: Unable to obtain lock",
- __FUNCTION__, __LINE__);
+ __func__, __LINE__);
return SME_QOS_STATUS_MODIFY_SETUP_FAILURE_RSP;
}
//Call the internal function for QoS modify, adding a layer of abstraction
@@ -802,7 +802,7 @@
sme_ReleaseGlobalLock( &pMac->sme );
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: QoS Modify return status on Flow %d is %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
QosFlowID, status);
return status;
}
@@ -829,14 +829,14 @@
sme_QosStatusType status;
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: QoS Release requested by client for Flow %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
QosFlowID);
lock_status = sme_AcquireGlobalLock( &pMac->sme );
if ( !HAL_STATUS_SUCCESS( lock_status ) )
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: Unable to obtain lock",
- __FUNCTION__, __LINE__);
+ __func__, __LINE__);
return SME_QOS_STATUS_RELEASE_FAILURE_RSP;
}
//Call the internal function for QoS release, adding a layer of abstraction
@@ -844,7 +844,7 @@
sme_ReleaseGlobalLock( &pMac->sme );
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: QoS Release return status on Flow %d is %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
QosFlowID, status);
return status;
}
@@ -871,7 +871,7 @@
//err msg
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: Invalid AC %d (via UP %d)",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
ac, pQoSInfo->ts_info.up );
return eHAL_STATUS_FAILURE;
}
@@ -879,7 +879,7 @@
sme_QosCb.def_QoSInfo[ac] = *pQoSInfo;
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: QoS default params set for AC %d (via UP %d)",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
ac, pQoSInfo->ts_info.up );
return eHAL_STATUS_SUCCESS;
}
@@ -913,7 +913,7 @@
tSmeCmd *pCommand;
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: msg = %d for QoS",
- __FUNCTION__, __LINE__, msg_type);
+ __func__, __LINE__, msg_type);
//switch on the msg type & make the state transition accordingly
switch(msg_type)
{
@@ -962,7 +962,7 @@
//err msg
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: unknown msg type = %d",
- __FUNCTION__, __LINE__, msg_type);
+ __func__, __LINE__, msg_type);
break;
}
return status;
@@ -987,7 +987,7 @@
eHalStatus status = eHAL_STATUS_FAILURE;
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: validation for QAP & APSD",
- __FUNCTION__, __LINE__);
+ __func__, __LINE__);
do
{
if(!HAL_STATUS_SUCCESS(csrGetParsedBssDescriptionIEs(pMac, pBssDesc, &pIes)))
@@ -995,7 +995,7 @@
//err msg
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: csrGetParsedBssDescriptionIEs() failed",
- __FUNCTION__, __LINE__);
+ __func__, __LINE__);
break;
}
//check if the AP is QAP & it supports APSD
@@ -1004,7 +1004,7 @@
//err msg
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: AP doesn't support QoS",
- __FUNCTION__, __LINE__);
+ __func__, __LINE__);
break;
}
@@ -1014,14 +1014,14 @@
//err msg
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: AP doesn't support APSD",
- __FUNCTION__, __LINE__);
+ __func__, __LINE__);
break;
}
status = eHAL_STATUS_SUCCESS;
}while(0);
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: validated with status = %d",
- __FUNCTION__, __LINE__, status);
+ __func__, __LINE__, status);
if(pIes)
{
vos_mem_free(pIes);
@@ -1048,7 +1048,7 @@
eHalStatus status = eHAL_STATUS_FAILURE;
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: On Session %d Event %d received from CSR",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
sessionId, ind );
switch(ind)
{
@@ -1103,13 +1103,13 @@
//Err msg
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: On Session %d Unknown Event %d received from CSR",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
sessionId, ind );
break;
}
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: On Session %d processed Event %d with status %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
sessionId, ind, status );
return status;
}
@@ -1131,7 +1131,7 @@
v_U8_t acm_mask = 0;
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: invoked",
- __FUNCTION__, __LINE__);
+ __func__, __LINE__);
for(ac = SME_QOS_EDCA_AC_BE; ac < SME_QOS_EDCA_AC_MAX; ac++)
{
if(sme_QosIsACM(pMac, pSirBssDesc, ac, pIes))
@@ -1142,7 +1142,7 @@
}
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: mask is %d",
- __FUNCTION__, __LINE__, acm_mask);
+ __func__, __LINE__, acm_mask);
return acm_mask;
}
/*--------------------------------------------------------------------------
@@ -1206,7 +1206,7 @@
eHalStatus hstatus;
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: invoked on session %d for flow %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
sessionId, QosFlowID);
pSession = &sme_QosCb.sessionInfo[sessionId];
// if caller sent an empty TSPEC, fill up with the default one
@@ -1214,14 +1214,14 @@
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_WARN,
"%s: %d: caller sent an empty QoS param list, using defaults",
- __FUNCTION__, __LINE__);
+ __func__, __LINE__);
// find the AC with UPType passed in
ac = sme_QosUpToAc(UPType);
if(SME_QOS_EDCA_AC_MAX == ac)
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: invalid AC %d from UP %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
ac, UPType);
return SME_QOS_STATUS_SETUP_INVALID_PARAMS_RSP;
@@ -1236,7 +1236,7 @@
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: invalid AC %d from UP %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
ac, pQoSInfo->ts_info.up);
return SME_QOS_STATUS_SETUP_INVALID_PARAMS_RSP;
@@ -1246,7 +1246,7 @@
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: invalid params",
- __FUNCTION__, __LINE__);
+ __func__, __LINE__);
return SME_QOS_STATUS_SETUP_INVALID_PARAMS_RSP;
}
Tspec_Info = *pQoSInfo;
@@ -1266,7 +1266,7 @@
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_MED,
"%s: %d: buffering the setup request for flow %d in state %d "
"since another request is pending",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
QosFlowID, pACInfo->curr_state );
bufferCommand = VOS_TRUE;
}
@@ -1281,7 +1281,7 @@
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_MED,
"%s: %d: buffering the setup request for flow %d in state %d, "
"waiting for full power",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
QosFlowID, pACInfo->curr_state );
bufferCommand = VOS_TRUE;
}
@@ -1303,7 +1303,7 @@
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: couldn't buffer the setup request in state = %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
pACInfo->curr_state );
// unable to buffer the request
// nothing is pending so vote powersave back on
@@ -1312,7 +1312,7 @@
}
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: Buffered setup request for flow = %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
QosFlowID);
return SME_QOS_STATUS_SETUP_REQ_PENDING_RSP;
}
@@ -1327,7 +1327,7 @@
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: On session %d with AC %d in state SME_QOS_LINK_UP "
"sme_QosSetup returned with status %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
sessionId, ac, status);
if(SME_QOS_STATUS_SETUP_REQ_PENDING_RSP != status)
{
@@ -1347,7 +1347,7 @@
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: couldn't allocate memory for the new "
"entry in the Flow List",
- __FUNCTION__, __LINE__);
+ __func__, __LINE__);
return SME_QOS_STATUS_SETUP_FAILURE_RSP;
}
pentry->ac_type = ac;
@@ -1368,7 +1368,7 @@
"%s: %d: On session %d with AC %d in state "
"SME_QOS_LINK_UP tspec_mask_status is %d "
"but should not be set yet",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
sessionId, ac, pACInfo->tspec_mask_status);
//ASSERT
VOS_ASSERT(0);
@@ -1410,7 +1410,7 @@
pentry->QoSInfo = Tspec_Info;
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: Creating entry on session %d at %p with flowID %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
sessionId, pentry, QosFlowID);
csrLLInsertTail(&sme_QosCb.flow_list, &pentry->link, VOS_TRUE);
}
@@ -1420,7 +1420,7 @@
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: On session %d unexpected status %d "
"returned by sme_QosSetup",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
sessionId, status);
new_state = pACInfo->curr_state;
if(buffered_cmd && hoRenewal)
@@ -1436,7 +1436,7 @@
case SME_QOS_REQUESTED:
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_MED,
"%s: %d: Buffering setup request for flow %d in state = %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
QosFlowID, pACInfo->curr_state );
//buffer cmd
cmd.command = SME_QOS_SETUP_REQ;
@@ -1454,7 +1454,7 @@
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: On session %d couldn't buffer the setup "
"request for flow %d in state = %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
sessionId, QosFlowID, pACInfo->curr_state );
// unable to buffer the request
// nothing is pending so vote powersave back on
@@ -1476,14 +1476,14 @@
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_MED,
"%s: %d: tspec_mask_status = %d for AC = %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
pACInfo->tspec_mask_status, ac);
if(!pACInfo->tspec_mask_status)
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: tspec_mask_status can't be 0 for ac = %d in "
"state = %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
ac, pACInfo->curr_state);
//ASSERT
VOS_ASSERT(0);
@@ -1557,11 +1557,11 @@
}
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_MED,
"%s: %d: tmask = %d, new_tmask = %d in state = %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
tmask, new_tmask, pACInfo->curr_state );
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_MED,
"%s: %d: tspec_mask_status = %d for AC = %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
pACInfo->tspec_mask_status, ac);
if(tmask)
{
@@ -1594,7 +1594,7 @@
//err msg
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: failed to aggregate params",
- __FUNCTION__, __LINE__);
+ __func__, __LINE__);
// unable to service the request
// nothing is pending so vote powersave back on
pSession->readyForPowerSave = VOS_TRUE;
@@ -1610,7 +1610,7 @@
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: no flows running for ac = %d while in state = %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
ac, pACInfo->curr_state );
//ASSERT
VOS_ASSERT(0);
@@ -1626,7 +1626,7 @@
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: On session %d with AC %d in state SME_QOS_QOS_ON "
"sme_QosSetup returned with status %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
sessionId, ac, status);
if(SME_QOS_STATUS_SETUP_REQ_PENDING_RSP != status)
{
@@ -1646,7 +1646,7 @@
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: couldn't allocate memory for the new "
"entry in the Flow List",
- __FUNCTION__, __LINE__);
+ __func__, __LINE__);
return SME_QOS_STATUS_SETUP_FAILURE_RSP;
}
pentry->ac_type = ac;
@@ -1657,7 +1657,7 @@
pentry->sessionId = sessionId;
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: Creating flow %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
QosFlowID);
if((SME_QOS_STATUS_SETUP_SUCCESS_NO_ACM_NO_APSD_RSP == status)||
(SME_QOS_STATUS_SETUP_SUCCESS_APSD_SET_ALREADY == status))
@@ -1690,7 +1690,7 @@
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: couldn't notify other "
"entries on this AC =%d",
- __FUNCTION__, __LINE__, ac);
+ __func__, __LINE__, ac);
}
}
}
@@ -1712,7 +1712,7 @@
pentry->QoSInfo = Tspec_Info;
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: On session %d creating entry at %p with flowID %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
sessionId, pentry, QosFlowID);
csrLLInsertTail(&sme_QosCb.flow_list, &pentry->link, VOS_TRUE);
}
@@ -1722,7 +1722,7 @@
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: On session %d unexpected status %d "
"returned by sme_QosSetup",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
sessionId, status);
new_state = pACInfo->curr_state;
}
@@ -1732,7 +1732,7 @@
default:
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: setup requested in unexpected state = %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
pACInfo->curr_state);
// unable to service the request
// nothing is pending so vote powersave back on
@@ -1807,7 +1807,7 @@
eHalStatus hstatus;
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: invoked for flow %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
QosFlowID);
vos_mem_zero(&search_key, sizeof(sme_QosSearchInfo));
@@ -1822,7 +1822,7 @@
//Err msg
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: no match found for flowID = %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
QosFlowID);
return SME_QOS_STATUS_MODIFY_SETUP_INVALID_PARAMS_RSP;
}
@@ -1839,7 +1839,7 @@
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: invalid params",
- __FUNCTION__, __LINE__);
+ __func__, __LINE__);
return SME_QOS_STATUS_MODIFY_SETUP_INVALID_PARAMS_RSP;
}
// For modify, make sure that direction, TID and UP are not being altered
@@ -1849,7 +1849,7 @@
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: Modification of direction/tid/up is not allowed",
- __FUNCTION__, __LINE__);
+ __func__, __LINE__);
return SME_QOS_STATUS_MODIFY_SETUP_INVALID_PARAMS_RSP;
}
@@ -1867,7 +1867,7 @@
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_MED,
"%s: %d: buffering the modify request for flow %d in state %d "
"since another request is pending",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
QosFlowID, pACInfo->curr_state );
bufferCommand = VOS_TRUE;
}
@@ -1882,7 +1882,7 @@
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_MED,
"%s: %d: buffering the modify request for flow %d in state %d, "
"waiting for full power",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
QosFlowID, pACInfo->curr_state );
bufferCommand = VOS_TRUE;
}
@@ -1900,7 +1900,7 @@
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: couldn't buffer the modify request in state = %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
pACInfo->curr_state );
// unable to buffer the request
// nothing is pending so vote powersave back on
@@ -1909,7 +1909,7 @@
}
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: Buffered modify request for flow = %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
QosFlowID);
return SME_QOS_STATUS_MODIFY_SETUP_PENDING_RSP;
}
@@ -1926,7 +1926,7 @@
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: couldn't allocate memory for the new "
"entry in the Flow List",
- __FUNCTION__, __LINE__);
+ __func__, __LINE__);
// unable to service the request
// nothing is pending so vote powersave back on
pSession->readyForPowerSave = VOS_TRUE;
@@ -1947,7 +1947,7 @@
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: On session %d creating modified "
"entry at %p with flowID %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
sessionId, pNewEntry, pNewEntry->QosFlowID);
//add the new entry under construction to the Flow List
csrLLInsertTail(&sme_QosCb.flow_list, &pNewEntry->link, VOS_TRUE);
@@ -1965,7 +1965,7 @@
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: On session %d with AC %d in state SME_QOS_QOS_ON "
"sme_QosSetup returned with status %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
sessionId, ac, status);
if(SME_QOS_STATUS_SETUP_REQ_PENDING_RSP != status)
{
@@ -2013,7 +2013,7 @@
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: couldn't notify other "
"entries on this AC =%d",
- __FUNCTION__, __LINE__, ac);
+ __func__, __LINE__, ac);
}
}
else if(SME_QOS_STATUS_SETUP_SUCCESS_NO_ACM_NO_APSD_RSP == status)
@@ -2036,7 +2036,7 @@
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: On session %d unexpected status %d "
"returned by sme_QosSetup",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
sessionId, status);
new_state = SME_QOS_QOS_ON;
}
@@ -2046,7 +2046,7 @@
//err msg
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: sme_QosUpdateParams() failed",
- __FUNCTION__, __LINE__);
+ __func__, __LINE__);
// unable to service the request
// nothing is pending so vote powersave back on
pSession->readyForPowerSave = VOS_TRUE;
@@ -2070,7 +2070,7 @@
case SME_QOS_REQUESTED:
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_MED,
"%s: %d: Buffering modify request for flow %d in state = %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
QosFlowID, pACInfo->curr_state );
//buffer cmd
cmd.command = SME_QOS_MODIFY_REQ;
@@ -2083,7 +2083,7 @@
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: couldn't buffer the modify request in state = %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
pACInfo->curr_state );
// unable to buffer the request
// nothing is pending so vote powersave back on
@@ -2098,7 +2098,7 @@
default:
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: modify requested in unexpected state = %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
pACInfo->curr_state);
// unable to service the request
// nothing is pending so vote powersave back on
@@ -2152,7 +2152,7 @@
tListElem *pResult= NULL;
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: invoked for flow %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
QosFlowID);
vos_mem_zero(&search_key, sizeof(sme_QosSearchInfo));
@@ -2168,7 +2168,7 @@
//Err msg
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: no match found for flowID = %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
QosFlowID);
return SME_QOS_STATUS_RELEASE_INVALID_PARAMS_RSP;
}
@@ -2192,7 +2192,7 @@
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_MED,
"%s: %d: buffering the release request for flow %d in state %d "
"since another request is pending",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
QosFlowID, pACInfo->curr_state );
bufferCommand = VOS_TRUE;
}
@@ -2207,7 +2207,7 @@
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_MED,
"%s: %d: buffering the release request for flow %d in state %d, "
"waiting for full power",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
QosFlowID, pACInfo->curr_state );
bufferCommand = VOS_TRUE;
}
@@ -2224,7 +2224,7 @@
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: couldn't buffer the release request in state = %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
pACInfo->curr_state );
// unable to buffer the request
// nothing is pending so vote powersave back on
@@ -2233,7 +2233,7 @@
}
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: Buffered release request for flow = %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
QosFlowID);
return SME_QOS_STATUS_RELEASE_REQ_PENDING_RSP;
}
@@ -2244,7 +2244,7 @@
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_MED,
"%s: %d: tspec_mask_status = %d for AC = %d with "
"entry tspec_mask = %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
pACInfo->tspec_mask_status, ac, flow_info->tspec_mask);
//check if multiple flows running on the ac
@@ -2315,7 +2315,7 @@
"%s: %d: On session %d buffering the AddTS request "
"for AC %d in state %d as Addts is pending "
"on other Tspec index of this AC",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
sessionId, ac, pACInfo->curr_state);
// Buffer the (aggregated) tspec request for downstream flows.
@@ -2333,7 +2333,7 @@
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: On session %d unable to buffer the AddTS "
"request for AC %d TSPEC %d in state %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
sessionId, ac, SME_QOS_TSPEC_MASK_BIT_2_SET, pACInfo->curr_state);
// unable to buffer the request
@@ -2363,7 +2363,7 @@
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: On session %d with AC %d in state SME_QOS_QOS_ON "
"sme_QosSetup returned with status %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
sessionId, ac, status);
if(SME_QOS_STATUS_SETUP_REQ_PENDING_RSP != status)
{
@@ -2387,7 +2387,7 @@
//delete the entry from Flow List
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: Deleting entry at %p with flowID %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
flow_info, QosFlowID);
csrLLRemoveEntry(&sme_QosCb.flow_list, pEntry, VOS_TRUE );
pDeletedFlow = flow_info;
@@ -2404,7 +2404,7 @@
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: couldn't notify other "
"entries on this AC =%d",
- __FUNCTION__, __LINE__, ac);
+ __func__, __LINE__, ac);
}
}
status = SME_QOS_STATUS_RELEASE_SUCCESS_RSP;
@@ -2422,7 +2422,7 @@
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: On session %d unexpected status %d "
"returned by sme_QosSetup",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
sessionId, status);
new_state = SME_QOS_LINK_UP;
pACInfo->num_flows[flow_info->tspec_mask - 1]--;
@@ -2432,7 +2432,7 @@
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: On session %d deleting entry at "
"%p with flowID %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
sessionId, flow_info, QosFlowID);
csrLLRemoveEntry(&sme_QosCb.flow_list, pEntry, VOS_TRUE );
pDeletedFlow = flow_info;
@@ -2450,7 +2450,7 @@
//err msg
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: sme_QosUpdateParams() failed",
- __FUNCTION__, __LINE__);
+ __func__, __LINE__);
// unable to service the request
// nothing is pending so vote powersave back on
pSession->readyForPowerSave = VOS_TRUE;
@@ -2510,7 +2510,7 @@
//err msg
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: sme_QosDelTsReq() failed",
- __FUNCTION__, __LINE__);
+ __func__, __LINE__);
status = SME_QOS_STATUS_RELEASE_FAILURE_RSP;
// we won't be waiting for a response from the AP
// so vote powersave back on
@@ -2548,7 +2548,7 @@
//err msg
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: Reassoc failed",
- __FUNCTION__, __LINE__);
+ __func__, __LINE__);
status = SME_QOS_STATUS_RELEASE_FAILURE_RSP;
// we won't be waiting for a response from the AP
// so vote powersave back on
@@ -2565,7 +2565,7 @@
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: nothing to do for AC = %d",
- __FUNCTION__, __LINE__, ac);
+ __func__, __LINE__, ac);
// we won't be waiting for a response from the AP
// so vote powersave back on
pSession->readyForPowerSave = VOS_TRUE;
@@ -2600,7 +2600,7 @@
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: Exceeded the array bounds of pACInfo->num_flows",
- __FUNCTION__, __LINE__);
+ __func__, __LINE__);
VOS_ASSERT (0);
return SME_QOS_STATUS_RELEASE_INVALID_PARAMS_RSP;
}
@@ -2616,7 +2616,7 @@
//delete the entry from Flow List
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: On session %d deleting entry at %p with flowID %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
sessionId, flow_info, QosFlowID);
csrLLRemoveEntry(&sme_QosCb.flow_list, pEntry, VOS_TRUE );
pDeletedFlow = flow_info;
@@ -2646,7 +2646,7 @@
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: couldn't buffer the release request in state = %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
pACInfo->curr_state );
// unable to service the request
// nothing is pending so vote powersave back on
@@ -2662,7 +2662,7 @@
//print error msg
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: release request in unexpected state = %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
pACInfo->curr_state );
//ASSERT
VOS_ASSERT(0);
@@ -2732,7 +2732,7 @@
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: Session Id %d is invalid",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
sessionId);
return status;
}
@@ -2741,7 +2741,7 @@
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: Session %d is inactive",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
sessionId);
return status;
}
@@ -2749,7 +2749,7 @@
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: Session %d has an Invalid BSS Descriptor",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
sessionId, ac);
return status;
}
@@ -2760,7 +2760,7 @@
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: On session %d unable to parse BSS IEs",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
sessionId, ac);
return status;
}
@@ -2771,7 +2771,7 @@
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: On session %d AP doesn't support QoS",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
sessionId);
vos_mem_free(pIes);
//notify HDD through the synchronous status msg
@@ -2800,7 +2800,7 @@
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: Request is looking for APSD but PMC doesn't "
"have support for APSD",
- __FUNCTION__, __LINE__);
+ __func__, __LINE__);
break;
}
if(SME_QOS_MAX_TID == pTspec_Info->ts_info.tid)
@@ -2816,12 +2816,12 @@
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: sme_QosAddTsReq() failed",
- __FUNCTION__, __LINE__);
+ __func__, __LINE__);
break;
}
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: On session %d AddTS on AC %d is pending",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
sessionId, ac);
status = SME_QOS_STATUS_SETUP_REQ_PENDING_RSP;
break;
@@ -2842,7 +2842,7 @@
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: On session %d reassoc needed "
"to disable APSD on AC %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
sessionId, ac);
csrGetModifyProfileFields(pMac, sessionId, &modifyProfileFields);
modifyProfileFields.uapsd_mask |= pSession->apsdMask;
@@ -2854,7 +2854,7 @@
//err msg
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: Unable to request reassociation",
- __FUNCTION__, __LINE__);
+ __func__, __LINE__);
break;
}
else
@@ -2862,7 +2862,7 @@
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: On session %d reassociation to enable "
"APSD on AC %d is pending",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
sessionId, ac);
status = SME_QOS_STATUS_SETUP_REQ_PENDING_RSP;
pACInfo->reassoc_pending = VOS_TRUE;
@@ -2875,7 +2875,7 @@
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: Request is not looking for APSD & Admission "
"Control isn't mandatory for the AC",
- __FUNCTION__, __LINE__);
+ __func__, __LINE__);
//return success right away
status = SME_QOS_STATUS_SETUP_SUCCESS_NO_ACM_NO_APSD_RSP;
}
@@ -2887,7 +2887,7 @@
// application is looking for APSD but AP doesn't support it
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: On session %d AP doesn't support APSD",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
sessionId);
break;
}
@@ -2899,7 +2899,7 @@
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: Request is looking for APSD and it is already "
"set for the AC",
- __FUNCTION__, __LINE__);
+ __func__, __LINE__);
break;
}
else
@@ -2912,7 +2912,7 @@
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: On session %d reassoc needed "
"to enable APSD on AC %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
sessionId, ac);
//reassoc logic
// update the UAPSD mask to include the new
@@ -2927,7 +2927,7 @@
//err msg
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: Unable to request reassociation",
- __FUNCTION__, __LINE__);
+ __func__, __LINE__);
break;
}
else
@@ -2935,7 +2935,7 @@
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: On session %d reassociation to enable "
"APSD on AC %d is pending",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
sessionId, ac);
status = SME_QOS_STATUS_SETUP_REQ_PENDING_RSP;
pACInfo->reassoc_pending = VOS_TRUE;
@@ -2946,7 +2946,7 @@
//err msg: no support for APSD from PMC
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: no support for APSD or BMPS from PMC",
- __FUNCTION__, __LINE__);
+ __func__, __LINE__);
}
}
}while(0);
@@ -3000,7 +3000,7 @@
pAddtsRsp->rsp.wmeTspecPresent = pTspec->present;
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO,
"%s: Copy Tspec to local data structure ac=%d, tspecIdx=%d",
- __FUNCTION__, ac, tspecIndex);
+ __func__, ac, tspecIndex);
if (pAddtsRsp->rsp.wmeTspecPresent)
{
@@ -3136,7 +3136,7 @@
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: up = %d, tid = %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
pTspec_Info->ts_info.up,
pTspec_Info->ts_info.tid);
}
@@ -3369,7 +3369,7 @@
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_WARN,
"%s: %d: Flow List empty, nothing to update",
- __FUNCTION__, __LINE__);
+ __func__, __LINE__);
return eHAL_STATUS_FAILURE;
}
@@ -3380,7 +3380,7 @@
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: Changing FlowID %d reason to SETUP and HO renewal to FALSE",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
flow_info->QosFlowID);
flow_info->reason = SME_QOS_REASON_SETUP;
flow_info->hoRenewal = eANI_BOOLEAN_TRUE;
@@ -3399,7 +3399,7 @@
eHalStatus status = eHAL_STATUS_FAILURE;
int i, j = 0;
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
- "%s: %d: invoked on session %d", __FUNCTION__, __LINE__,
+ "%s: %d: invoked on session %d", __func__, __LINE__,
sessionId);
pSession = &sme_QosCb.sessionInfo[sessionId];
@@ -3411,7 +3411,7 @@
//err msg
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: couldn't allocate memory for the msg buffer",
- __FUNCTION__, __LINE__);
+ __func__, __LINE__);
return eHAL_STATUS_FAILURE;
}
@@ -3482,7 +3482,7 @@
status = eHAL_STATUS_SUCCESS;
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: sent down a AGGR QoS req to PE",
- __FUNCTION__, __LINE__);
+ __func__, __LINE__);
}
return status;
@@ -3608,7 +3608,7 @@
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: invoked on session %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
sessionId);
pSession = &sme_QosCb.sessionInfo[sessionId];
@@ -3718,7 +3718,7 @@
#endif
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: invoked on session %d for AC %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
sessionId, ac);
pSession = &sme_QosCb.sessionInfo[sessionId];
pMsg = (tSirAddtsReq *)vos_mem_malloc(sizeof(tSirAddtsReq));
@@ -3727,7 +3727,7 @@
//err msg
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: couldn't allocate memory for the msg buffer",
- __FUNCTION__, __LINE__);
+ __func__, __LINE__);
return eHAL_STATUS_FAILURE;
}
vos_mem_zero(pMsg, sizeof(tSirAddtsReq));
@@ -3780,7 +3780,7 @@
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: BSS descriptor is NULL so we don't send requst to PE",
- __FUNCTION__, __LINE__);
+ __func__, __LINE__);
return eHAL_STATUS_FAILURE;
}
vos_mem_copy( &pMsg->bssId[ 0 ],
@@ -3788,7 +3788,7 @@
sizeof(tCsrBssid) );
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: up = %d, tid = %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
pTspec_Info->ts_info.up,
pTspec_Info->ts_info.tid);
#ifdef FEATURE_WLAN_CCX
@@ -3803,7 +3803,7 @@
status = eHAL_STATUS_SUCCESS;
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: sent down a ADDTS req to PE",
- __FUNCTION__, __LINE__);
+ __func__, __LINE__);
//event: EVENT_WLAN_QOS
#ifdef FEATURE_WLAN_DIAG_SUPPORT
qos.eventId = SME_QOS_DIAG_ADDTS_REQ;
@@ -3843,7 +3843,7 @@
#endif
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: invoked on session %d for AC %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
sessionId, ac);
pMsg = (tSirDeltsReq *)vos_mem_malloc(sizeof(tSirDeltsReq));
if (!pMsg)
@@ -3851,7 +3851,7 @@
//err msg
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: couldn't allocate memory for the msg buffer",
- __FUNCTION__, __LINE__);
+ __func__, __LINE__);
return eHAL_STATUS_FAILURE;
}
vos_mem_zero(pMsg, sizeof(tSirDeltsReq));
@@ -3892,7 +3892,7 @@
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: BSS descriptor is NULL so we don't send request to PE",
- __FUNCTION__, __LINE__);
+ __func__, __LINE__);
return eHAL_STATUS_FAILURE;
}
vos_mem_copy( &pMsg->bssId[ 0 ],
@@ -3901,7 +3901,7 @@
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: up = %d, tid = %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
pTspecInfo->ts_info.up,
pTspecInfo->ts_info.tid);
vos_mem_zero(&pACInfo->curr_QoSInfo[tspec_mask - 1],
@@ -3911,7 +3911,7 @@
status = eHAL_STATUS_SUCCESS;
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: sme_QosDelTsReq:Test: sent down a DELTS req to PE",
- __FUNCTION__, __LINE__);
+ __func__, __LINE__);
//event: EVENT_WLAN_QOS
#ifdef FEATURE_WLAN_DIAG_SUPPORT
qos.eventId = SME_QOS_DIAG_DELTS;
@@ -3953,7 +3953,7 @@
#ifdef WLAN_FEATURE_VOWIFI_11R
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: invoked on session %d for UP %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
sessionId, up);
ac = sme_QosUpToAc(up);
@@ -3962,7 +3962,7 @@
//err msg
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: invalid AC %d from UP %d",
- __FUNCTION__, __LINE__, ac, up);
+ __func__, __LINE__, ac, up);
return eHAL_STATUS_FAILURE;
}
@@ -3980,7 +3980,7 @@
#endif
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: Invoked on session %d with return code %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
sessionId, paddts_rsp->rc);
// our outstanding request has been serviced
// we can go into powersave
@@ -4021,7 +4021,7 @@
// msg
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: Invoked on session %d with return code %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
sessionId, pDeltsRsp->rc);
pSession = &sme_QosCb.sessionInfo[sessionId];
// our outstanding request has been serviced
@@ -4058,7 +4058,7 @@
#endif
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: Invoked on session %d for UP %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
sessionId, up);
ac = sme_QosUpToAc(up);
if(SME_QOS_EDCA_AC_MAX == ac)
@@ -4066,7 +4066,7 @@
//err msg
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: invalid AC %d from UP %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
ac, up);
return eHAL_STATUS_FAILURE;
}
@@ -4084,7 +4084,7 @@
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: no match found for ac = %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
search_key.key.ac_type);
//ASSERT
VOS_ASSERT(0);
@@ -4130,7 +4130,7 @@
sme_QosEdcaAcType ac = SME_QOS_EDCA_AC_BE;
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: invoked on session %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
sessionId);
pSession = &sme_QosCb.sessionInfo[sessionId];
if(((SME_QOS_INIT == pSession->ac_info[SME_QOS_EDCA_AC_BE].curr_state)&&
@@ -4145,7 +4145,7 @@
//err msg
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: pEvent_info is NULL",
- __FUNCTION__, __LINE__);
+ __func__, __LINE__);
return status;
}
if(!((sme_QosAssocInfo *)pEvent_info)->pBssDesc)
@@ -4153,7 +4153,7 @@
//err msg
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: pBssDesc is NULL",
- __FUNCTION__, __LINE__);
+ __func__, __LINE__);
return status;
}
if((pSession->assocInfo.pBssDesc) &&
@@ -4162,7 +4162,7 @@
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: assoc with the same BSS, no update needed",
- __FUNCTION__, __LINE__);
+ __func__, __LINE__);
}
else
{
@@ -4173,7 +4173,7 @@
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: wrong state: BE %d, BK %d, VI %d, VO %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
pSession->ac_info[SME_QOS_EDCA_AC_BE].curr_state,
pSession->ac_info[SME_QOS_EDCA_AC_BK].curr_state,
pSession->ac_info[SME_QOS_EDCA_AC_VI].curr_state,
@@ -4209,7 +4209,7 @@
default:
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: On session %d AC %d is in wrong state %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
sessionId, ac, pACInfo->curr_state);
//ASSERT
VOS_ASSERT(0);
@@ -4236,7 +4236,7 @@
sme_QosEdcaAcType ac;
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: invoked on session %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
sessionId);
pSession = &sme_QosCb.sessionInfo[sessionId];
@@ -4246,7 +4246,7 @@
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: no need for state transition, should "
"already be in handoff state",
- __FUNCTION__, __LINE__);
+ __func__, __LINE__);
VOS_ASSERT(pSession->ac_info[0].curr_state == SME_QOS_HANDOFF);
VOS_ASSERT(pSession->ac_info[1].curr_state == SME_QOS_HANDOFF);
VOS_ASSERT(pSession->ac_info[2].curr_state == SME_QOS_HANDOFF);
@@ -4261,7 +4261,7 @@
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: no need for state transition, should "
"already be in handoff state",
- __FUNCTION__, __LINE__);
+ __func__, __LINE__);
VOS_ASSERT(pSession->ac_info[0].curr_state == SME_QOS_HANDOFF);
VOS_ASSERT(pSession->ac_info[1].curr_state == SME_QOS_HANDOFF);
VOS_ASSERT(pSession->ac_info[2].curr_state == SME_QOS_HANDOFF);
@@ -4280,7 +4280,7 @@
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: no need for state transition, should "
"already be in handoff state",
- __FUNCTION__, __LINE__);
+ __func__, __LINE__);
VOS_ASSERT(pSession->ac_info[0].curr_state == SME_QOS_HANDOFF);
VOS_ASSERT(pSession->ac_info[1].curr_state == SME_QOS_HANDOFF);
VOS_ASSERT(pSession->ac_info[2].curr_state == SME_QOS_HANDOFF);
@@ -4309,7 +4309,7 @@
default:
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: On session %d AC %d is in wrong state %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
sessionId, ac, pACInfo->curr_state);
//ASSERT
VOS_ASSERT(0);
@@ -4342,7 +4342,7 @@
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: invoked on session %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
sessionId);
pSession = &sme_QosCb.sessionInfo[sessionId];
// our pending reassociation has completed
@@ -4354,7 +4354,7 @@
//err msg
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: pEvent_info is NULL",
- __FUNCTION__, __LINE__);
+ __func__, __LINE__);
return status;
}
if(!((sme_QosAssocInfo *)pEvent_info)->pBssDesc)
@@ -4362,7 +4362,7 @@
//err msg
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: pBssDesc is NULL",
- __FUNCTION__, __LINE__);
+ __func__, __LINE__);
return status;
}
status = sme_QosSaveAssocInfo(pSession, pEvent_info);
@@ -4371,7 +4371,7 @@
//err msg
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: sme_QosSaveAssocInfo() failed",
- __FUNCTION__, __LINE__);
+ __func__, __LINE__);
}
//TBH: Assuming both handoff algo & 11r willn't be enabled at the same time
if(pSession->handoffRequested)
@@ -4463,7 +4463,7 @@
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: no match found for ac = %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
search_key.key.ac_type);
//ASSERT
VOS_ASSERT(0);
@@ -4486,7 +4486,7 @@
default:
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: On session %d AC %d is in wrong state %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
sessionId, ac, pACInfo->curr_state);
//ASSERT
VOS_ASSERT(0);
@@ -4514,7 +4514,7 @@
sme_QosEdcaAcType ac;
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: invoked on session %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
sessionId);
pSession = &sme_QosCb.sessionInfo[sessionId];
// our pending reassociation has completed
@@ -4554,7 +4554,7 @@
default:
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: On session %d AC %d is in wrong state %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
sessionId, ac, pACInfo->curr_state);
//ASSERT
VOS_ASSERT(0);
@@ -4582,7 +4582,7 @@
v_U8_t ac;
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: invoked on session %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
sessionId);
pSession = &sme_QosCb.sessionInfo[sessionId];
for(ac = SME_QOS_EDCA_AC_BE; ac < SME_QOS_EDCA_AC_MAX; ac++)
@@ -4603,7 +4603,7 @@
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: SME_QOS_CSR_HANDOFF_ASSOC_REQ received in "
"SME_QOS_HANDOFF state with FT in progress"
- , __FUNCTION__, __LINE__);
+ , __func__, __LINE__);
break;
}
#endif
@@ -4613,7 +4613,7 @@
default:
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: On session %d AC %d is in wrong state %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
sessionId, ac, pACInfo->curr_state);
//ASSERT
VOS_ASSERT(0);
@@ -4654,7 +4654,7 @@
eHalStatus status = eHAL_STATUS_FAILURE;
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: invoked on session %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
sessionId);
pSession = &sme_QosCb.sessionInfo[sessionId];
//go back to original state before handoff
@@ -4690,7 +4690,7 @@
#endif
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: On session %d AC %d is in wrong state %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
sessionId, ac, pACInfo->curr_state);
//ASSERT
VOS_ASSERT(0);
@@ -4716,7 +4716,7 @@
v_U8_t ac;
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: invoked on session %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
sessionId);
pSession = &sme_QosCb.sessionInfo[sessionId];
for(ac = SME_QOS_EDCA_AC_BE; ac < SME_QOS_EDCA_AC_MAX; ac++)
@@ -4748,7 +4748,7 @@
default:
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: On session %d AC %d is in wrong state %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
sessionId, ac, pACInfo->curr_state);
//ASSERT
VOS_ASSERT(0);
@@ -4781,7 +4781,7 @@
sme_QosSessionInfo *pSession;
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: invoked on session %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
sessionId);
pSession = &sme_QosCb.sessionInfo[sessionId];
if((pSession->handoffRequested)
@@ -4795,7 +4795,7 @@
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: no need for state transition, should "
"already be in handoff state",
- __FUNCTION__, __LINE__);
+ __func__, __LINE__);
VOS_ASSERT(pSession->ac_info[0].curr_state == SME_QOS_HANDOFF);
VOS_ASSERT(pSession->ac_info[1].curr_state == SME_QOS_HANDOFF);
VOS_ASSERT(pSession->ac_info[2].curr_state == SME_QOS_HANDOFF);
@@ -4845,7 +4845,7 @@
sme_QosEdcaAcType ac;
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: invoked on session %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
sessionId);
pSession = &sme_QosCb.sessionInfo[sessionId];
if(pSession->handoffRequested)
@@ -4853,7 +4853,7 @@
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: no need for state transition, should "
"already be in handoff state",
- __FUNCTION__, __LINE__);
+ __func__, __LINE__);
VOS_ASSERT(pSession->ac_info[0].curr_state == SME_QOS_HANDOFF);
VOS_ASSERT(pSession->ac_info[1].curr_state == SME_QOS_HANDOFF);
VOS_ASSERT(pSession->ac_info[2].curr_state == SME_QOS_HANDOFF);
@@ -4899,7 +4899,7 @@
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: invoked on session %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
sessionId);
pSession = &sme_QosCb.sessionInfo[sessionId];
@@ -4922,7 +4922,7 @@
default:
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: On session %d AC %d is in wrong state %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
sessionId, ac, pACInfo->curr_state);
//ASSERT
VOS_ASSERT(0);
@@ -5019,7 +5019,7 @@
sme_QosWmmUpType up = (sme_QosWmmUpType)pRsp->tspec.tsinfo.traffic.userPrio;
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: invoked on session %d for UP %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
sessionId, up);
ac = sme_QosUpToAc(up);
if(SME_QOS_EDCA_AC_MAX == ac)
@@ -5027,7 +5027,7 @@
//err msg
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: invalid AC %d from UP %d",
- __FUNCTION__, __LINE__, ac, up);
+ __func__, __LINE__, ac, up);
return eHAL_STATUS_FAILURE;
}
pSession = &sme_QosCb.sessionInfo[sessionId];
@@ -5039,7 +5039,7 @@
//ASSERT
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: On session %d an AddTS is not pending on AC %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
sessionId, ac);
VOS_ASSERT(0);
return eHAL_STATUS_FAILURE;
@@ -5054,7 +5054,7 @@
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: On session %d no match found for ac = %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
sessionId, search_key.key.ac_type);
//ASSERT
VOS_ASSERT(0);
@@ -5107,7 +5107,7 @@
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: invoked on session %d for AC %d TSPEC %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
sessionId, search_key.key.ac_type, new_tspec_mask);
pSession = &sme_QosCb.sessionInfo[sessionId];
@@ -5120,7 +5120,7 @@
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: Exceeded the array bounds of pSession->ac_info",
- __FUNCTION__, __LINE__);
+ __func__, __LINE__);
VOS_ASSERT (0);
return eHAL_STATUS_FAILURE;
}
@@ -5130,7 +5130,7 @@
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: Flow List empty, nothing to update",
- __FUNCTION__, __LINE__);
+ __func__, __LINE__);
return eHAL_STATUS_FAILURE;
}
@@ -5149,7 +5149,7 @@
//msg
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: Flow %d matches",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
flow_info->QosFlowID);
pACInfo->num_flows[flow_info->tspec_mask - 1]--;
pACInfo->num_flows[new_tspec_mask - 1]++;
@@ -5164,7 +5164,7 @@
//msg
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: Flow %d matches",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
flow_info->QosFlowID);
pACInfo->num_flows[flow_info->tspec_mask - 1]--;
pACInfo->num_flows[new_tspec_mask - 1]++;
@@ -5213,7 +5213,7 @@
#endif //FEATURE_WLAN_DIAG_SUPPORT
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: invoked on session %d for UP %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
sessionId, up);
pSession = &sme_QosCb.sessionInfo[sessionId];
ac = sme_QosUpToAc(up);
@@ -5222,7 +5222,7 @@
//err msg
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: invalid AC %d from UP %d",
- __FUNCTION__, __LINE__, ac, up);
+ __func__, __LINE__, ac, up);
return eHAL_STATUS_FAILURE;
}
pACInfo = &pSession->ac_info[ac];
@@ -5232,7 +5232,7 @@
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: On session %d an AddTS is not pending on AC %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
sessionId, ac);
//ASSERT
VOS_ASSERT(0);
@@ -5262,7 +5262,7 @@
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: Exceeded the array bounds of pACInfo->requested_QosInfo",
- __FUNCTION__, __LINE__);
+ __func__, __LINE__);
VOS_ASSERT (0);
return eHAL_STATUS_FAILURE;
}
@@ -5312,7 +5312,7 @@
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: On session %d no match found for ac %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
sessionId, search_key.key.ac_type);
//ASSERT
VOS_ASSERT(0);
@@ -5392,19 +5392,19 @@
sme_QosWmmTspecInfo TspecInfo;
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: invoked",
- __FUNCTION__, __LINE__);
+ __func__, __LINE__);
if(!pInput_Tspec_Info)
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: input is NULL, nothing to aggregate",
- __FUNCTION__, __LINE__);
+ __func__, __LINE__);
return eHAL_STATUS_FAILURE;
}
if(!pCurrent_Tspec_Info)
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: Current is NULL, can't aggregate",
- __FUNCTION__, __LINE__);
+ __func__, __LINE__);
return eHAL_STATUS_FAILURE;
}
vos_mem_copy(&TspecInfo, pCurrent_Tspec_Info,
@@ -5572,13 +5572,13 @@
sme_QosWmmTspecInfo Tspec_Info;
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: invoked on session %d for AC %d TSPEC %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
sessionId, ac, tspec_mask);
if(!pTspec_Info)
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: output is NULL, can't aggregate",
- __FUNCTION__, __LINE__);
+ __func__, __LINE__);
return eHAL_STATUS_FAILURE;
}
vos_mem_zero(&Tspec_Info, sizeof(sme_QosWmmTspecInfo));
@@ -5587,7 +5587,7 @@
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: Flow List empty, nothing to update",
- __FUNCTION__, __LINE__);
+ __func__, __LINE__);
return eHAL_STATUS_FAILURE;
}
pSession = &sme_QosCb.sessionInfo[sessionId];
@@ -5606,7 +5606,7 @@
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: Flow %d matches",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
flow_info->QosFlowID);
if((SME_QOS_REASON_RELEASE == flow_info->reason ) ||
@@ -5616,7 +5616,7 @@
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: Skipping Flow %d as it is marked "
"for release/modify",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
flow_info->QosFlowID);
}
else if(!HAL_STATUS_SUCCESS(sme_QosAggregateParams(&flow_info->QoSInfo,
@@ -5626,7 +5626,7 @@
//err msg
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: sme_QosAggregateParams() failed",
- __FUNCTION__, __LINE__);
+ __func__, __LINE__);
}
}
pEntry = pNextEntry;
@@ -5654,7 +5654,7 @@
}
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_MED,
"%s: %d: ac = %d up = %d returned",
- __FUNCTION__, __LINE__, ac, up);
+ __func__, __LINE__, ac, up);
return up;
}
/*--------------------------------------------------------------------------
@@ -5674,7 +5674,7 @@
}
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_MED,
"%s: %d: up = %d ac = %d returned",
- __FUNCTION__, __LINE__, up, ac);
+ __func__, __LINE__, up, ac);
return ac;
}
/*--------------------------------------------------------------------------
@@ -5701,7 +5701,7 @@
pACInfo->curr_state = new_state;
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: On session %d new state=%d, old state=%d, for AC=%d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
sessionId, pACInfo->curr_state, pACInfo->prev_state, ac );
}
/*--------------------------------------------------------------------------
@@ -5726,7 +5726,7 @@
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: Flow List empty, can't search",
- __FUNCTION__, __LINE__);
+ __func__, __LINE__);
return NULL;
}
while( pEntry )
@@ -5743,7 +5743,7 @@
//msg
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: match found on flowID, ending search",
- __FUNCTION__, __LINE__);
+ __func__, __LINE__);
break;
}
}
@@ -5754,7 +5754,7 @@
//msg
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: match found on ac, ending search",
- __FUNCTION__, __LINE__);
+ __func__, __LINE__);
break;
}
}
@@ -5765,7 +5765,7 @@
//msg
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: match found on reason, ending search",
- __FUNCTION__, __LINE__);
+ __func__, __LINE__);
break;
}
}
@@ -5777,7 +5777,7 @@
//msg
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: match found on reason, ending search",
- __FUNCTION__, __LINE__);
+ __func__, __LINE__);
break;
}
@@ -5814,7 +5814,7 @@
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: Flow List empty, can't search",
- __FUNCTION__, __LINE__);
+ __func__, __LINE__);
return eHAL_STATUS_FAILURE;
}
while( pEntry )
@@ -5832,13 +5832,13 @@
//msg
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: match found on flowID, ending search",
- __FUNCTION__, __LINE__);
+ __func__, __LINE__);
status = fnp(pMac, pEntry);
if(eHAL_STATUS_FAILURE == status)
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: Failed to process entry",
- __FUNCTION__, __LINE__);
+ __func__, __LINE__);
break;
}
}
@@ -5850,14 +5850,14 @@
//msg
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: match found on ac, ending search",
- __FUNCTION__, __LINE__);
+ __func__, __LINE__);
flow_info->hoRenewal = pSession->ac_info[flow_info->ac_type].hoRenewal;
status = fnp(pMac, pEntry);
if(eHAL_STATUS_FAILURE == status)
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: Failed to process entry",
- __FUNCTION__, __LINE__);
+ __func__, __LINE__);
break;
}
}
@@ -5886,7 +5886,7 @@
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: pSirBssDesc is NULL",
- __FUNCTION__, __LINE__);
+ __func__, __LINE__);
return VOS_FALSE;
}
@@ -5903,7 +5903,7 @@
//err msg
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: csrGetParsedBssDescriptionIEs() failed",
- __FUNCTION__, __LINE__);
+ __func__, __LINE__);
return VOS_FALSE;
}
@@ -5929,7 +5929,7 @@
default:
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: unknown AC = %d",
- __FUNCTION__, __LINE__, ac);
+ __func__, __LINE__, ac);
//Assert
VOS_ASSERT(0);
break;
@@ -5937,7 +5937,7 @@
}//IS_QOS_BSS
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: ACM = %d for AC = %d",
- __FUNCTION__, __LINE__, ret_val, ac );
+ __func__, __LINE__, ret_val, ac );
if (NULL == pIes)
{
/* IEs were allocated locally so free them */
@@ -5966,7 +5966,7 @@
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: Flow List empty, nothing to buffer",
- __FUNCTION__, __LINE__);
+ __func__, __LINE__);
return eHAL_STATUS_FAILURE;
}
while( pEntry )
@@ -5999,7 +5999,7 @@
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: couldn't buffer the setup request for "
"flow %d in handoff state",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
flow_info->QosFlowID);
}
else
@@ -6007,7 +6007,7 @@
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: buffered a setup request for "
"flow %d in handoff state",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
flow_info->QosFlowID);
}
}
@@ -6022,7 +6022,7 @@
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: couldn't buffer the release request for "
"flow %d in handoff state",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
flow_info->QosFlowID);
}
else
@@ -6030,7 +6030,7 @@
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: buffered a release request for "
"flow %d in handoff state",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
flow_info->QosFlowID);
}
}
@@ -6046,7 +6046,7 @@
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: couldn't buffer the modify request for "
"flow %d in handoff state",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
flow_info->QosFlowID);
}
else
@@ -6054,14 +6054,14 @@
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: buffered a modify request for "
"flow %d in handoff state",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
flow_info->QosFlowID);
}
}
//delete the entry from Flow List
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: Deleting original entry at %p with flowID %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
flow_info, flow_info->QosFlowID);
csrLLRemoveEntry(&sme_QosCb.flow_list, pEntry, VOS_TRUE );
vos_mem_free(flow_info);
@@ -6091,7 +6091,7 @@
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_WARN,
"%s: %d: Flow List empty, nothing to delete",
- __FUNCTION__, __LINE__);
+ __func__, __LINE__);
return eHAL_STATUS_FAILURE;
}
while( pEntry )
@@ -6112,7 +6112,7 @@
}
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: Deleting entry at %p with flowID %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
flow_info, flow_info->QosFlowID);
//delete the entry from Flow List
csrLLRemoveEntry(&sme_QosCb.flow_list, pEntry, VOS_TRUE );
@@ -6139,14 +6139,14 @@
sme_QosCmdInfoEntry * pentry = NULL;
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: Invoked",
- __FUNCTION__, __LINE__);
+ __func__, __LINE__);
pentry = (sme_QosCmdInfoEntry *) vos_mem_malloc(sizeof(sme_QosCmdInfoEntry));
if (!pentry)
{
//err msg
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: Memory allocation failure",
- __FUNCTION__, __LINE__);
+ __func__, __LINE__);
return eHAL_STATUS_FAILURE;
}
// copy the entire CmdInfo
@@ -6181,7 +6181,7 @@
eHalStatus halStatus = eHAL_STATUS_SUCCESS;
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: Invoked on session %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
sessionId);
pSession = &sme_QosCb.sessionInfo[sessionId];
if(!csrLLIsListEmpty( &pSession->bufferedCommandList, VOS_FALSE ))
@@ -6192,7 +6192,7 @@
//Err msg
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: no more buffered commands on session %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
sessionId);
pSession->readyForPowerSave = VOS_TRUE;
return eHAL_STATUS_FAILURE;
@@ -6215,7 +6215,7 @@
//Err msg
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: sme_QosInternalSetupReq failed on session %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
sessionId);
halStatus = eHAL_STATUS_FAILURE;
}
@@ -6229,7 +6229,7 @@
//Err msg
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: sme_QosInternalReleaseReq failed on session %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
sessionId);
halStatus = eHAL_STATUS_FAILURE;
}
@@ -6244,7 +6244,7 @@
//Err msg
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: sme_QosInternalModifyReq failed on session %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
sessionId);
halStatus = eHAL_STATUS_FAILURE;
}
@@ -6260,7 +6260,7 @@
//Err msg
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: sme_QosReRequestAddTS failed on session %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
sessionId);
halStatus = eHAL_STATUS_FAILURE;
}
@@ -6269,7 +6269,7 @@
//err msg
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: On session %d unknown cmd = %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
sessionId, pcmd->cmdInfo.command);
//ASSERT
VOS_ASSERT(0);
@@ -6282,7 +6282,7 @@
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: cmd buffer empty",
- __FUNCTION__, __LINE__);
+ __func__, __LINE__);
pSession->readyForPowerSave = VOS_TRUE;
}
return halStatus;
@@ -6304,14 +6304,14 @@
tListElem *pEntry= NULL, *pNextEntry = NULL;
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: Invoked on session %d",
- __FUNCTION__, __LINE__, sessionId);
+ __func__, __LINE__, sessionId);
pSession = &sme_QosCb.sessionInfo[sessionId];
pEntry = csrLLPeekHead( &pSession->bufferedCommandList, VOS_TRUE );
if(!pEntry)
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_WARN,
"%s: %d: Buffered List empty, nothing to delete on session %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
sessionId);
return eHAL_STATUS_FAILURE;
}
@@ -6320,7 +6320,7 @@
pNextEntry = csrLLNext( &pSession->bufferedCommandList, pEntry, VOS_TRUE );
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO,
"%s: %d: deleting entry from buffered List",
- __FUNCTION__, __LINE__);
+ __func__, __LINE__);
//delete the entry from Flow List
csrLLRemoveEntry(&pSession->bufferedCommandList, pEntry, VOS_TRUE );
// reclaim the memory
@@ -6351,7 +6351,7 @@
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: pAssoc_info is NULL",
- __FUNCTION__, __LINE__);
+ __func__, __LINE__);
return eHAL_STATUS_FAILURE;
}
//clean up the assoc info if already set
@@ -6368,7 +6368,7 @@
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: couldn't allocate memory for the bss Descriptor",
- __FUNCTION__, __LINE__);
+ __func__, __LINE__);
return eHAL_STATUS_FAILURE;
}
vos_mem_copy(pBssDesc, pAssoc_info->pBssDesc, bssLen);
@@ -6404,7 +6404,7 @@
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: Entry is NULL",
- __FUNCTION__, __LINE__);
+ __func__, __LINE__);
//ASSERT
VOS_ASSERT(0);
return eHAL_STATUS_FAILURE;
@@ -6422,7 +6422,7 @@
flow_info->QosFlowID);
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: Entry with flowID = %d getting notified",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
flow_info->QosFlowID);
}
return eHAL_STATUS_SUCCESS;
@@ -6449,7 +6449,7 @@
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: Entry is NULL",
- __FUNCTION__, __LINE__);
+ __func__, __LINE__);
//ASSERT
VOS_ASSERT(0);
return eHAL_STATUS_FAILURE;
@@ -6467,7 +6467,7 @@
flow_info->QosFlowID);
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: Entry with flowID = %d getting notified",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
flow_info->QosFlowID);
}
return eHAL_STATUS_SUCCESS;
@@ -6490,7 +6490,7 @@
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: Entry is NULL",
- __FUNCTION__, __LINE__);
+ __func__, __LINE__);
VOS_ASSERT(0);
return eHAL_STATUS_FAILURE;
}
@@ -6505,7 +6505,7 @@
//delete the original entry from Flow List
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: Deleting original entry at %p with flowID %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
flow_info, flow_info->QosFlowID);
csrLLRemoveEntry(&sme_QosCb.flow_list, pEntry, VOS_TRUE );
// reclaim the memory
@@ -6538,7 +6538,7 @@
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: Entry is NULL",
- __FUNCTION__, __LINE__);
+ __func__, __LINE__);
//ASSERT
VOS_ASSERT(0);
return eHAL_STATUS_FAILURE;
@@ -6555,7 +6555,7 @@
pACInfo->num_flows[flow_info->tspec_mask - 1]--;
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: Deleting entry at %p with flowID %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
flow_info, flow_info->QosFlowID);
csrLLRemoveEntry(&sme_QosCb.flow_list, pEntry, VOS_TRUE );
// reclaim the memory
@@ -6587,7 +6587,7 @@
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: Entry is NULL",
- __FUNCTION__, __LINE__);
+ __func__, __LINE__);
//ASSERT
VOS_ASSERT(0);
return eHAL_STATUS_FAILURE;
@@ -6695,7 +6695,7 @@
//delete the entry from Flow List
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: Deleting entry at %p with flowID %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
flow_info, flow_info->QosFlowID);
csrLLRemoveEntry(&sme_QosCb.flow_list, pEntry, VOS_TRUE );
// reclaim the memory
@@ -6734,7 +6734,7 @@
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: Entry is NULL",
- __FUNCTION__, __LINE__);
+ __func__, __LINE__);
//ASSERT
VOS_ASSERT(0);
return eHAL_STATUS_FAILURE;
@@ -6787,7 +6787,7 @@
//delete the entry from Flow List
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: Deleting entry at %p with flowID %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
flow_info, flow_info->QosFlowID);
csrLLRemoveEntry(&sme_QosCb.flow_list, pEntry, VOS_TRUE );
// reclaim the memory
@@ -6830,7 +6830,7 @@
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: Entry is NULL",
- __FUNCTION__, __LINE__);
+ __func__, __LINE__);
//ASSERT
VOS_ASSERT(0);
return eHAL_STATUS_FAILURE;
@@ -6844,7 +6844,7 @@
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: No need to notify the HDD, the ADDTS "
"success is not for index = %d of the AC = %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
flow_info->tspec_mask, ac);
return eHAL_STATUS_SUCCESS;
}
@@ -6977,7 +6977,7 @@
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: Deleting entry at %p with flowID %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
flow_info, flow_info->QosFlowID);
//delete the entry from Flow List
csrLLRemoveEntry(&sme_QosCb.flow_list, pEntry, VOS_TRUE );
@@ -7072,7 +7072,7 @@
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: PMC failed to put the chip in Full power",
- __FUNCTION__, __LINE__);
+ __func__, __LINE__);
//ASSERT
VOS_ASSERT(0);
}
@@ -7183,14 +7183,14 @@
status = eHAL_STATUS_SUCCESS;
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: nothing to process in PMC state %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
pmcState);
}
if(!HAL_STATUS_SUCCESS(status))
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: ignoring Device(PMC) state change to %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
pmcState);
}
@@ -7216,7 +7216,7 @@
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: Flow List empty, can't search",
- __FUNCTION__, __LINE__);
+ __func__, __LINE__);
return eHAL_STATUS_FAILURE;
}
while( pEntry )
@@ -7259,7 +7259,7 @@
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: Flow List empty, can't search",
- __FUNCTION__, __LINE__);
+ __func__, __LINE__);
return eHAL_STATUS_FAILURE;
}
while( pEntry )
@@ -7331,7 +7331,7 @@
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: Session Id %d is invalid",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
sessionId);
return VOS_FALSE;
}
@@ -7342,7 +7342,7 @@
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: Session %d is inactive",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
sessionId);
return VOS_FALSE;
}
@@ -7351,7 +7351,7 @@
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: Session %d has an Invalid BSS Descriptor",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
sessionId);
return VOS_FALSE;
}
@@ -7363,7 +7363,7 @@
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: On session %d unable to parse BSS IEs",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
sessionId);
return VOS_FALSE;
}
@@ -7375,7 +7375,7 @@
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: On session %d HT Caps aren't present but application set ack policy to HT ",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
sessionId);
vos_mem_free(pIes);
@@ -7415,7 +7415,7 @@
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: fail to get command buffer for command %d",
- __FUNCTION__, __LINE__, cmdType);
+ __func__, __LINE__, cmdType);
break;
}
pCommand->command = cmdType;
@@ -7433,7 +7433,7 @@
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: NULL pointer passed",
- __FUNCTION__, __LINE__);
+ __func__, __LINE__);
status = eHAL_STATUS_INVALID_PARAMETER;
}
break;
@@ -7445,7 +7445,7 @@
default:
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: invalid command type %d",
- __FUNCTION__, __LINE__, cmdType );
+ __func__, __LINE__, cmdType );
status = eHAL_STATUS_INVALID_PARAMETER;
break;
}
@@ -7486,7 +7486,7 @@
default:
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: invalid command type %d",
- __FUNCTION__, __LINE__, pCommand->command );
+ __func__, __LINE__, pCommand->command );
break;
}//switch
} while(0);
@@ -7512,7 +7512,7 @@
v_BOOL_t addtsWhenACMNotSet = CSR_IS_ADDTS_WHEN_ACMOFF_SUPPORTED(pMac);
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: Invoked",
- __FUNCTION__, __LINE__);
+ __func__, __LINE__);
for (sessionId = 0; sessionId < CSR_ROAM_SESSION_MAX; ++sessionId)
{
pSession = &sme_QosCb.sessionInfo[sessionId];
@@ -7522,7 +7522,7 @@
}
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: Session %d is active",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
sessionId);
if( HAL_STATUS_SUCCESS(csrGetParsedBssDescriptionIEs(pMac, pSession->assocInfo.pBssDesc, &pIesLocal)) )
{
@@ -7543,7 +7543,7 @@
// Yes, QoS is active on this AC
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: On session %d AC %d has QoS active",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
sessionId, ac);
// Does this AC require ACM?
if(( acm_mask & (1 << (SME_QOS_EDCA_AC_VO - ac)) ) || addtsWhenACMNotSet )
@@ -7551,7 +7551,7 @@
// Yes, so we need to re-add any TSPECS
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: On session %d AC %d has ACM enabled",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
sessionId, ac);
// Are any TSPECs active?
if( pACInfo->tspec_mask_status )
@@ -7605,7 +7605,7 @@
// QoS is set, ACM is on, but no TSPECs -- inconsistent state
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: On session %d AC %d has QoS enabled and ACM is set, but no TSPEC",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
sessionId, ac);
VOS_ASSERT(0);
}
@@ -7621,7 +7621,7 @@
uapsd_mask |= 1 << (SME_QOS_EDCA_AC_VO - ac);
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: On session %d AC %d has ACM disabled, uapsd mask now 0x%X",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
sessionId, ac, uapsd_mask);
}
}
@@ -7647,7 +7647,7 @@
//err msg
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: On Session %d Reassoc failed",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
sessionId);
}
}
@@ -7656,7 +7656,7 @@
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: On Session %d failed to parse IEs",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
sessionId);
}
}
@@ -7679,7 +7679,7 @@
sme_QosCmdInfo cmd;
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: Invoked on session %d for AC %d TSPEC %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
sessionId, ac, tspecMask);
pSession = &sme_QosCb.sessionInfo[sessionId];
pACInfo = &pSession->ac_info[ac];
@@ -7699,7 +7699,7 @@
"%s: %d: On session %d buffering the AddTS request "
"for AC %d in state %d as Addts is pending "
"on other AC or waiting for full power",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
sessionId, ac, pACInfo->curr_state);
//buffer cmd
cmd.command = SME_QOS_RESEND_REQ;
@@ -7713,7 +7713,7 @@
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: On session %d unable to buffer the AddTS "
"request for AC %d TSPEC %d in state %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
sessionId, ac, tspecMask, pACInfo->curr_state);
// unable to buffer the request
// nothing is pending so vote powersave back on
@@ -7733,7 +7733,7 @@
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: sme_QosSetup returned in SME_QOS_QOS_ON state on "
"AC %d with status =%d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
ac, status);
if(SME_QOS_STATUS_SETUP_REQ_PENDING_RSP != status)
{
@@ -7753,7 +7753,7 @@
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: UAPSD is setup already status = %d "
"returned by sme_QosSetup",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
status);
}
else
@@ -7761,7 +7761,7 @@
//err msg
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: unexpected status = %d returned by sme_QosSetup",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
status);
}
}
@@ -7770,7 +7770,7 @@
case SME_QOS_REQUESTED:
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: Re-Add request in state = %d buffer the request",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
pACInfo->curr_state);
cmd.command = SME_QOS_RESEND_REQ;
cmd.pMac = pMac;
@@ -7782,7 +7782,7 @@
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: couldn't buffer the readd request in state = %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
pACInfo->curr_state );
// unable to buffer the request
// nothing is pending so vote powersave back on
@@ -7798,7 +7798,7 @@
//print error msg,
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: %d: ReAdd request in unexpected state = %d",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
pACInfo->curr_state );
// unable to service the request
// nothing is pending so vote powersave back on
@@ -7834,7 +7834,7 @@
eHalStatus status;
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"%s: %d: Invoked on session %d with UAPSD mask 0x%X",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
sessionId, pModFields->uapsd_mask);
pSession = &sme_QosCb.sessionInfo[sessionId];
status = csrReassoc(pMac, sessionId, pModFields, &pSession->roamID, fForce);
@@ -7848,7 +7848,7 @@
pACInfo = &pSession->ac_info[ac];
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO,
"%s: %d: AC[%d] is in state [%d]",
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
ac, pACInfo->curr_state );
// If it is already in HANDOFF state, don't do anything since we
// MUST preserve the previous state and sme_QosStateTransition
@@ -7872,7 +7872,7 @@
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_FATAL,
"%s: %d: Software Test made the flow counter wrap, "
"QoS may no longer be functional",
- __FUNCTION__, __LINE__);
+ __func__, __LINE__);
sme_QosCb.nextFlowId = SME_QOS_MIN_FLOW_ID;
}
else
diff --git a/CORE/SME/src/btc/btcApi.c b/CORE/SME/src/btc/btcApi.c
index d92e03c..9c86a09 100644
--- a/CORE/SME/src/btc/btcApi.c
+++ b/CORE/SME/src/btc/btcApi.c
@@ -129,7 +129,7 @@
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_FATAL,
"%s: %d: cannot deregister with pmcDeregisterDeviceStateUpdateInd()",
- __FUNCTION__, __LINE__);
+ __func__, __LINE__);
}
return VOS_STATUS_SUCCESS;
@@ -180,7 +180,7 @@
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, "%s: "
"Invalid link type %d for Sync Connection. BT event will be dropped ",
- __FUNCTION__, pBtEvent->uEventParam.btSyncConnection.linkType);
+ __func__, pBtEvent->uEventParam.btSyncConnection.linkType);
return VOS_STATUS_E_FAILURE;
}
break;
@@ -191,7 +191,7 @@
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, "%s: "
"Invalid connection handle %d or link type %d for Sync Connection. BT event will be dropped ",
- __FUNCTION__,
+ __func__,
pBtEvent->uEventParam.btSyncConnection.connectionHandle,
pBtEvent->uEventParam.btSyncConnection.linkType);
return VOS_STATUS_E_FAILURE;
@@ -202,7 +202,7 @@
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, "%s: "
"Invalid mode %d for ACL Connection. BT event will be dropped ",
- __FUNCTION__,
+ __func__,
pBtEvent->uEventParam.btAclModeChange.mode);
return VOS_STATUS_E_FAILURE;
}
@@ -217,7 +217,7 @@
if (NULL == ptrSmeBtEvent)
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, "%s: "
- "Not able to allocate memory for BT event", __FUNCTION__);
+ "Not able to allocate memory for BT event", __func__);
return VOS_STATUS_E_FAILURE;
}
btcLogEvent(pMac, pBtEvent);
@@ -231,7 +231,7 @@
if(VOS_STATUS_SUCCESS != vos_mq_post_message(VOS_MODULE_ID_WDA, &msg))
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, "%s: "
- "Not able to post WDA_SIGNAL_BT_EVENT message to WDA", __FUNCTION__);
+ "Not able to post WDA_SIGNAL_BT_EVENT message to WDA", __func__);
vos_mem_free( ptrSmeBtEvent );
return VOS_STATUS_E_FAILURE;
}
@@ -266,21 +266,21 @@
if( NULL == pBtEvent )
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, "%s: "
- "Null pointer for SME BT Event", __FUNCTION__);
+ "Null pointer for SME BT Event", __func__);
return VOS_STATUS_E_FAILURE;
}
if(( BTC_WLAN_ONLY == pMac->btc.btcConfig.btcExecutionMode ) ||
( BTC_PTA_ONLY == pMac->btc.btcConfig.btcExecutionMode ))
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, "%s: "
- "BTC execution mode not set to BTC_SMART_COEXISTENCE. BT event will be dropped", __FUNCTION__);
+ "BTC execution mode not set to BTC_SMART_COEXISTENCE. BT event will be dropped", __func__);
return VOS_STATUS_E_FAILURE;
}
if( pBtEvent->btEventType < 0 || pBtEvent->btEventType >= BT_EVENT_TYPE_MAX )
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, "%s: "
"Invalid BT event %d being passed. BT event will be dropped",
- __FUNCTION__, pBtEvent->btEventType);
+ __func__, pBtEvent->btEventType);
return VOS_STATUS_E_FAILURE;
}
//Check PMC state to make sure whether we need to defer
@@ -1622,7 +1622,7 @@
static void btcLogEvent (tHalHandle hHal, tpSmeBtEvent pBtEvent)
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, "%s: "
- "Bluetooth Event %d received", __FUNCTION__, pBtEvent->btEventType);
+ "Bluetooth Event %d received", __func__, pBtEvent->btEventType);
switch(pBtEvent->btEventType)
{
case BT_EVENT_CREATE_SYNC_CONNECTION:
@@ -1865,14 +1865,14 @@
if (NULL == pMsg)
{
- smsLog(pMac, LOGE, "in %s msg ptr is NULL\n", __FUNCTION__);
+ smsLog(pMac, LOGE, "in %s msg ptr is NULL\n", __func__);
status = eHAL_STATUS_FAILURE;
}
else
{
// DEBUG
smsLog(pMac, LOG1, "Coex indication in %s(), type %d",
- __FUNCTION__, pSmeCoexInd->coexIndType);
+ __func__, pSmeCoexInd->coexIndType);
// suspend heartbeat monitoring
if (pSmeCoexInd->coexIndType == SIR_COEX_IND_TYPE_DISABLE_HB_MONITOR)
@@ -1895,7 +1895,7 @@
// unknown indication type
else
{
- smsLog(pMac, LOGE, "unknown Coex indication type in %s()", __FUNCTION__);
+ smsLog(pMac, LOGE, "unknown Coex indication type in %s()", __func__);
}
}
diff --git a/CORE/SME/src/csr/csrApiRoam.c b/CORE/SME/src/csr/csrApiRoam.c
index 3f3b942..6f13d9e 100644
--- a/CORE/SME/src/csr/csrApiRoam.c
+++ b/CORE/SME/src/csr/csrApiRoam.c
@@ -800,10 +800,10 @@
case eSmeCommandScan:
// We need to inform the requester before droping the scan command
smsLog( pMac, LOGW, "%s: Drop scan reason %d callback 0x%X\n",
- __FUNCTION__, pCommand->u.scanCmd.reason, (unsigned int)pCommand->u.scanCmd.callback);
+ __func__, pCommand->u.scanCmd.reason, (unsigned int)pCommand->u.scanCmd.callback);
if (NULL != pCommand->u.scanCmd.callback)
{
- smsLog( pMac, LOGW, "%s callback scan requester\n", __FUNCTION__);
+ smsLog( pMac, LOGW, "%s callback scan requester\n", __func__);
csrScanCallCallback(pMac, pCommand, eCSR_SCAN_ABORT);
}
csrReleaseCommandScan( pMac, pCommand );
@@ -3593,7 +3593,7 @@
concurrentChannel =
csrGetConcurrentOperationChannel(pMac);
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, "%s: "
- " csr Concurrent Channel = %d", __FUNCTION__, concurrentChannel);
+ " csr Concurrent Channel = %d", __func__, concurrentChannel);
if ((concurrentChannel) &&
(concurrentChannel ==
pScanResult->Result.BssDescriptor.channelId))
@@ -4639,7 +4639,7 @@
else
{
smsLog(pMac, LOGE, "%s: Copying of memory failed for %d bytes !!!\n",
- __FUNCTION__, len);
+ __func__, len);
palFreeMemory( pMac->hHdd, pSession->connectedInfo.pbFrames );
pSession->connectedInfo.pbFrames = NULL;
}
@@ -9285,7 +9285,7 @@
}
else
{
- smsLog(pMac, LOGW, " %s Fail to start roaming, status = %d", __FUNCTION__, status);
+ smsLog(pMac, LOGW, " %s Fail to start roaming, status = %d", __func__, status);
fToRoam = eANI_BOOLEAN_FALSE;
}
}
@@ -12649,7 +12649,7 @@
{
if(pMsg == NULL)
{
- smsLog(pMac, LOGE, "in %s msg ptr is NULL\n", __FUNCTION__);
+ smsLog(pMac, LOGE, "in %s msg ptr is NULL\n", __func__);
status = eHAL_STATUS_FAILURE;
break;
}
@@ -12674,7 +12674,7 @@
else
{
smsLog(pMac, LOGE, "in %s eWNI_SME_ADD_STA_SELF_RSP Received but NO Add sta session command are ACTIVE ...\n",
- __FUNCTION__);
+ __func__);
status = eHAL_STATUS_FAILURE;
break;
}
@@ -12682,7 +12682,7 @@
else
{
smsLog(pMac, LOGE, "in %s eWNI_SME_ADD_STA_SELF_RSP Received but NO commands are ACTIVE ...\n",
- __FUNCTION__);
+ __func__);
status = eHAL_STATUS_FAILURE;
break;
}
@@ -12808,7 +12808,7 @@
{
if(pMsg == NULL)
{
- smsLog(pMac, LOGE, "in %s msg ptr is NULL\n", __FUNCTION__);
+ smsLog(pMac, LOGE, "in %s msg ptr is NULL\n", __func__);
status = eHAL_STATUS_FAILURE;
break;
}
@@ -12834,12 +12834,12 @@
status = sme_AcquireGlobalLock( &pMac->sme );
if (! HAL_STATUS_SUCCESS( status ) )
{
- smsLog(pMac, LOGP, "%s: Failed to Acquire Lock\n", __FUNCTION__);
+ smsLog(pMac, LOGP, "%s: Failed to Acquire Lock\n", __func__);
return status;
}
}
else {
- smsLog(pMac, LOGE, "%s: Failed to Release Lock\n", __FUNCTION__);
+ smsLog(pMac, LOGE, "%s: Failed to Release Lock\n", __func__);
}
}
@@ -12854,7 +12854,7 @@
else
{
smsLog(pMac, LOGE, "in %s eWNI_SME_DEL_STA_SELF_RSP Received but NO Del sta session command are ACTIVE ...\n",
- __FUNCTION__);
+ __func__);
status = eHAL_STATUS_FAILURE;
break;
}
@@ -12862,7 +12862,7 @@
else
{
smsLog(pMac, LOGE, "in %s eWNI_SME_DEL_STA_SELF_RSP Received but NO commands are ACTIVE ...\n",
- __FUNCTION__);
+ __func__);
status = eHAL_STATUS_FAILURE;
break;
}
diff --git a/CORE/SME/src/csr/csrApiScan.c b/CORE/SME/src/csr/csrApiScan.c
index f5300ab..977a56c 100644
--- a/CORE/SME/src/csr/csrApiScan.c
+++ b/CORE/SME/src/csr/csrApiScan.c
@@ -5431,7 +5431,7 @@
pCommand->u.scanCmd.callback(pMac, pCommand->u.scanCmd.pContext, pCommand->u.scanCmd.scanID, scanStatus);
// sme_AcquireGlobalLock( &pMac->sme );
} else {
- smsLog( pMac, LOG2, "%s:%d - Callback NULL!!!\n", __FUNCTION__, __LINE__);
+ smsLog( pMac, LOG2, "%s:%d - Callback NULL!!!\n", __func__, __LINE__);
}
}
@@ -6026,7 +6026,7 @@
break;
default:
smsLog (pMac, LOGW, "%s: -------- abort scan command reason = %d\n",
- __FUNCTION__, pCommand->u.scanCmd.reason);
+ __func__, pCommand->u.scanCmd.reason);
//The rest are fresh scan requests
if( csrLLRemoveEntry(&pMac->sme.smeCmdPendingList, pEntry, LL_ACCESS_NOLOCK) )
{
@@ -6541,7 +6541,7 @@
// expanding this entry will overflow our allocation
smsLog(pMac, LOGE,
"%s: Buffer overflow, start %d, num %d, offset %d",
- __FUNCTION__,
+ __func__,
pChannelSet->firstChannel,
pChannelSet->numChannels,
pChannelSet->interChannelOffset);
@@ -6570,7 +6570,7 @@
// this entry will overflow our allocation
smsLog(pMac, LOGE,
"%s: Buffer overflow, start %d, num %d, offset %d",
- __FUNCTION__,
+ __func__,
pChannelSet->firstChannel,
pChannelSet->numChannels,
pChannelSet->interChannelOffset);
diff --git a/CORE/SME/src/csr/csrLinkList.c b/CORE/SME/src/csr/csrLinkList.c
index 74d940f..1b6d6ba 100644
--- a/CORE/SME/src/csr/csrLinkList.c
+++ b/CORE/SME/src/csr/csrLinkList.c
@@ -112,7 +112,7 @@
tListElem *pLast;
if( !pEntry)
{
- VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_FATAL,"%s: Error!! pEntry is Null", __FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_FATAL,"%s: Error!! pEntry is Null", __func__);
return;
}
@@ -130,7 +130,7 @@
if( !pList)
{
- VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_FATAL,"%s: Error!! pList is Null", __FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_FATAL,"%s: Error!! pList is Null", __func__);
return c;
}
@@ -149,7 +149,7 @@
if( !pList)
{
- VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_FATAL,"%s: Error!! pList is Null", __FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_FATAL,"%s: Error!! pList is Null", __func__);
return ;
}
@@ -165,7 +165,7 @@
if( !pList)
{
- VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_FATAL,"%s: Error!! pList is Null", __FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_FATAL,"%s: Error!! pList is Null", __func__);
return ;
}
@@ -183,7 +183,7 @@
if( !pList)
{
- VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_FATAL,"%s: Error!! pList is Null", __FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_FATAL,"%s: Error!! pList is Null", __func__);
return fEmpty ;
}
@@ -214,7 +214,7 @@
if( !pList)
{
- VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_FATAL,"%s: Error!! pList is Null", __FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_FATAL,"%s: Error!! pList is Null", __func__);
return fFound ;
}
@@ -247,7 +247,7 @@
if( !pList)
{
- VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_FATAL,"%s: Error!! pList is Null", __FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_FATAL,"%s: Error!! pList is Null", __func__);
return eHAL_STATUS_FAILURE ;
}
@@ -275,7 +275,7 @@
{
if( !pList)
{
- VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_FATAL,"%s: Error!! pList is Null", __FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_FATAL,"%s: Error!! pList is Null", __func__);
return ;
}
@@ -292,7 +292,7 @@
{
if( !pList)
{
- VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_FATAL,"%s: Error!! pList is Null", __FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_FATAL,"%s: Error!! pList is Null", __func__);
return;
}
@@ -318,7 +318,7 @@
if( !pList)
{
- VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_FATAL,"%s: Error!! pList is Null", __FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_FATAL,"%s: Error!! pList is Null", __func__);
return;
}
@@ -342,7 +342,7 @@
{
if( !pList)
{
- VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_FATAL,"%s: Error!! pList is Null", __FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_FATAL,"%s: Error!! pList is Null", __func__);
return ;
}
@@ -369,7 +369,7 @@
if( !pList)
{
- VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_FATAL,"%s: Error!! pList is Null", __FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_FATAL,"%s: Error!! pList is Null", __func__);
return pEntry ;
}
@@ -403,7 +403,7 @@
if( !pList)
{
- VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_FATAL,"%s: Error!! pList is Null", __FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_FATAL,"%s: Error!! pList is Null", __func__);
return pEntry ;
}
@@ -436,7 +436,7 @@
if( !pList)
{
- VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_FATAL,"%s: Error!! pList is Null", __FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_FATAL,"%s: Error!! pList is Null", __func__);
return pEntry ;
}
@@ -469,7 +469,7 @@
if( !pList)
{
- VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_FATAL,"%s: Error!! pList is Null", __FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_FATAL,"%s: Error!! pList is Null", __func__);
return pEntry ;
}
@@ -501,7 +501,7 @@
if( !pList)
{
- VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_FATAL,"%s: Error!! pList is Null", __FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_FATAL,"%s: Error!! pList is Null", __func__);
return ;
}
@@ -531,7 +531,7 @@
if( !pList)
{
- VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_FATAL,"%s: Error!! pList is Null", __FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_FATAL,"%s: Error!! pList is Null", __func__);
return fFound;
}
@@ -576,7 +576,7 @@
if( !pList)
{
- VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_FATAL,"%s: Error!! pList is Null", __FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_FATAL,"%s: Error!! pList is Null", __func__);
return pNextEntry ;
}
@@ -613,7 +613,7 @@
if( !pList)
{
- VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_FATAL,"%s: Error!! pList is Null", __FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_FATAL,"%s: Error!! pList is Null", __func__);
return pNextEntry ;
}
diff --git a/CORE/SME/src/csr/csrUtil.c b/CORE/SME/src/csr/csrUtil.c
index bf605c4..eb277ba 100644
--- a/CORE/SME/src/csr/csrUtil.c
+++ b/CORE/SME/src/csr/csrUtil.c
@@ -3566,7 +3566,7 @@
tANI_U8 PMKId[CSR_RSN_PMKID_SIZE];
tDot11fBeaconIEs *pIesLocal = pIes;
- smsLog(pMac, LOGW, "%s called...", __FUNCTION__);
+ smsLog(pMac, LOGW, "%s called...", __func__);
do
{
diff --git a/CORE/SME/src/oemData/oemDataApi.c b/CORE/SME/src/oemData/oemDataApi.c
index 38b4ffa..f7fac1c 100644
--- a/CORE/SME/src/oemData/oemDataApi.c
+++ b/CORE/SME/src/oemData/oemDataApi.c
@@ -213,7 +213,7 @@
tANI_U16 msgLen;
tCsrRoamSession *pSession = CSR_GET_SESSION( pMac, pOemDataReq->sessionId );
- smsLog(pMac, LOGW, "OEM_DATA: entering Function %s\n", __FUNCTION__);
+ smsLog(pMac, LOGW, "OEM_DATA: entering Function %s\n", __func__);
msgLen = (tANI_U16)(sizeof(tSirOemDataReq));
@@ -226,7 +226,7 @@
status = palCopyMemory(pMac->hHdd, pMsg->oemDataReq, pOemDataReq->oemDataReq, OEM_DATA_REQ_SIZE);
if(HAL_STATUS_SUCCESS(status))
{
- smsLog(pMac, LOGW, "OEM_DATA: sending message to pe%s\n", __FUNCTION__);
+ smsLog(pMac, LOGW, "OEM_DATA: sending message to pe%s\n", __func__);
status = palSendMBMessage(pMac->hHdd, pMsg);
}
else
@@ -235,7 +235,7 @@
}
}
- smsLog(pMac, LOGW, "OEM_DATA: exiting Function %s\n", __FUNCTION__);
+ smsLog(pMac, LOGW, "OEM_DATA: exiting Function %s\n", __func__);
return status;
}
@@ -262,13 +262,13 @@
if(eHAL_STATUS_SUCCESS == oemData_IsOemDataReqAllowed(pMac))
{
- smsLog(pMac, LOG1, "%s: OEM_DATA REQ allowed in the current mode\n", __FUNCTION__);
+ smsLog(pMac, LOG1, "%s: OEM_DATA REQ allowed in the current mode\n", __func__);
pMac->oemData.oemDataReqActive = eANI_BOOLEAN_TRUE;
status = oemData_SendMBOemDataReq(pMac, &(pOemDataReqCmd->u.oemDataCmd.oemDataReq));
}
else
{
- smsLog(pMac, LOG1, "%s: OEM_DATA REQ not allowed in the current mode\n", __FUNCTION__);
+ smsLog(pMac, LOG1, "%s: OEM_DATA REQ not allowed in the current mode\n", __func__);
oemData_ReleaseOemDataReqCommand(pMac, pOemDataReqCmd, eOEM_DATA_REQ_INVALID_MODE);
pMac->oemData.oemDataReqActive = eANI_BOOLEAN_FALSE;
}
@@ -291,13 +291,13 @@
tSirOemDataRsp* pOemDataRsp = NULL;
pMac = PMAC_STRUCT(hHal);
- smsLog(pMac, LOG1, "%s: OEM_DATA Entering\n", __FUNCTION__);
+ smsLog(pMac, LOG1, "%s: OEM_DATA Entering\n", __func__);
do
{
if(pMsg == NULL)
{
- smsLog(pMac, LOGE, "in %s msg ptr is NULL\n", __FUNCTION__);
+ smsLog(pMac, LOGE, "in %s msg ptr is NULL\n", __func__);
status = eHAL_STATUS_FAILURE;
break;
}
@@ -326,7 +326,7 @@
if(pMac->oemData.pOemDataRsp == NULL)
{
sme_ReleaseGlobalLock(&pMac->sme);
- smsLog(pMac, LOGE, "in %s vos_mem_malloc failed for pMac->oemData.pOemDataRsp\n", __FUNCTION__);
+ smsLog(pMac, LOGE, "in %s vos_mem_malloc failed for pMac->oemData.pOemDataRsp\n", __func__);
status = eHAL_STATUS_FAILURE;
break;
}
@@ -339,14 +339,14 @@
else
{
smsLog(pMac, LOGE, "in %s eWNI_SME_OEM_DATA_RSP Received but NO REQs are ACTIVE ...\n",
- __FUNCTION__);
+ __func__);
status = eHAL_STATUS_FAILURE;
break;
}
}
else
{
- smsLog(pMac, LOGE, "in %s eWNI_SME_OEM_DATA_RSP Received but NO commands are ACTIVE ...\n", __FUNCTION__);
+ smsLog(pMac, LOGE, "in %s eWNI_SME_OEM_DATA_RSP Received but NO commands are ACTIVE ...\n", __func__);
status = eHAL_STATUS_FAILURE;
break;
}
diff --git a/CORE/SME/src/p2p/p2p_Api.c b/CORE/SME/src/p2p/p2p_Api.c
index 8b45b1d..32e49f8 100644
--- a/CORE/SME/src/p2p/p2p_Api.c
+++ b/CORE/SME/src/p2p/p2p_Api.c
@@ -100,7 +100,7 @@
status = palAllocateMemory(pMac->hHdd, (void**)&pMsg, len );
if(HAL_STATUS_SUCCESS(status))
{
- VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO, "%s call\n", __FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO, "%s call\n", __func__);
palZeroMemory(pMac->hHdd, pMsg, sizeof(tSirRemainOnChnReq));
pMsg->messageType = eWNI_SME_REMAIN_ON_CHANNEL_REQ;
pMsg->length = len;
@@ -279,21 +279,21 @@
if(CSR_SESSION_ID_INVALID == HDDsessionId)
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
- " %s fail to get HDD sessionID (SMESessionID %d)", __FUNCTION__, pSmeRsp->sessionId);
+ " %s fail to get HDD sessionID (SMESessionID %d)", __func__, pSmeRsp->sessionId);
return eHAL_STATUS_INVALID_PARAMETER;
}
pP2pContext = &pMac->p2pContext[HDDsessionId];
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO, "%s status %d Action Frame %d actionFrameTimeout %d\n",
- __FUNCTION__, pSmeRsp->statusCode, pP2pContext->actionFrameType
+ __func__, pSmeRsp->statusCode, pP2pContext->actionFrameType
, pP2pContext->actionFrameTimeout);
vos_mem_zero(&RoamInfo, sizeof(tCsrRoamInfo));
if (pSmeRsp->statusCode != eSIR_SME_SUCCESS && !pP2pContext->actionFrameTimeout
&& pP2pContext->pSentActionFrame)
{
- VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO, "%s Action frame:Ack not received. Retransmitting\n", __FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO, "%s Action frame:Ack not received. Retransmitting\n", __func__);
if(NULL == pP2pContext->pNextActionFrm)
{
@@ -302,7 +302,7 @@
if (!HAL_STATUS_SUCCESS(status))
{
smsLog(pMac, LOGE, " %s fail to start retryActionFrameTimerHandler\n",
- __FUNCTION__, pP2pContext->NextActionFrameType);
+ __func__, pP2pContext->NextActionFrameType);
}
return status;
}
@@ -310,7 +310,7 @@
else
{
smsLog(pMac, LOGE, " %s send next action frame type %d Last frame status (%d)",
- __FUNCTION__, rspStatus);
+ __func__, rspStatus);
//Force it to be success
rspStatus = eSIR_SME_SUCCESS;
}
@@ -351,7 +351,7 @@
}
else
{
- VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_WARN, "%s pSentActionFrame is null \n", __FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_WARN, "%s pSentActionFrame is null \n", __func__);
}
if(pP2pContext->pNextActionFrm)
{
@@ -365,7 +365,7 @@
}
else
{
- VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, "%s cannot get lock1", __FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, "%s cannot get lock1", __func__);
}
if(NULL != pP2pContext->pSentActionFrame)
@@ -376,7 +376,7 @@
pP2pContext->ActionFrameSendTimeout * PAL_TIMER_TO_MS_UNIT, eANI_BOOLEAN_FALSE);
if (!HAL_STATUS_SUCCESS(status))
{
- smsLog(pMac, LOGE, FL(" %s fail to start timer status %d"), __FUNCTION__, status);
+ smsLog(pMac, LOGE, FL(" %s fail to start timer status %d"), __func__, status);
//Without the timer we cannot continue
csrRoamCallCallback((tpAniSirGlobal)pP2pContext->hHal,
pP2pContext->SMEsessionId, &RoamInfo, 0,
@@ -400,7 +400,7 @@
ACTION_FRAME_RETRY_TIMEOUT * PAL_TIMER_TO_MS_UNIT, eANI_BOOLEAN_FALSE);
if (!HAL_STATUS_SUCCESS(status))
{
- smsLog(pMac, LOGE, " %s fail to start retryActionFrameTimerHandler\n", __FUNCTION__);
+ smsLog(pMac, LOGE, " %s fail to start retryActionFrameTimerHandler\n", __func__);
}
}
}
@@ -574,20 +574,20 @@
p2pActionFrameTimerHandler, pP2pContext);
if (!HAL_STATUS_SUCCESS(status))
{
- smsLog(pMac, LOGE, " %s fail to alloc actionFrame timer for session %d\n", __FUNCTION__, i);
+ smsLog(pMac, LOGE, " %s fail to alloc actionFrame timer for session %d\n", __func__, i);
break;
}
status = palTimerAlloc(pMac->hHdd, &pP2pContext->listenTimerHandler,
p2pListenDiscoverTimerHandler, pP2pContext);
if (!HAL_STATUS_SUCCESS(status))
{
- smsLog(pMac, LOGE, " %s fail to alloc listen timer for session %d\n", __FUNCTION__, i);
+ smsLog(pMac, LOGE, " %s fail to alloc listen timer for session %d\n", __func__, i);
break;
}
status = palTimerAlloc(pMac->hHdd, &pP2pContext->discoverTimer, p2pDiscoverTimerHandler, pP2pContext);
if (!HAL_STATUS_SUCCESS(status))
{
- smsLog(pMac, LOGE, " %s fail to alloc discover timer for session %d\n", __FUNCTION__, i);
+ smsLog(pMac, LOGE, " %s fail to alloc discover timer for session %d\n", __func__, i);
break;
}
@@ -595,7 +595,7 @@
p2pRetryActionFrameTimerHandler, pP2pContext);
if (!HAL_STATUS_SUCCESS(status))
{
- smsLog(pMac, LOGE, " %s fail to alloc retryActionFrameTimerHandler timer for session %d\n", __FUNCTION__, i);
+ smsLog(pMac, LOGE, " %s fail to alloc retryActionFrameTimerHandler timer for session %d\n", __func__, i);
break;
}
@@ -767,7 +767,7 @@
#endif
} while(0);
- smsLog(pMac, LOGW, "exiting function %s\n", __FUNCTION__);
+ smsLog(pMac, LOGW, "exiting function %s\n", __func__);
return(status);
}
@@ -781,7 +781,7 @@
tANI_U16 msgLen;
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_MED,
- " %s sends action frame", __FUNCTION__);
+ " %s sends action frame", __func__);
msgLen = (tANI_U16)((sizeof( tSirMbMsg )) + len);
status = palAllocateMemory(pMac->hHdd, (void **)&pMsg, msgLen);
if(HAL_STATUS_SUCCESS(status))
@@ -878,7 +878,7 @@
if ( !HAL_STATUS_SUCCESS( status ) )
{
status = eHAL_STATUS_FAILURE;
- VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, "%s Cannot get the country code\n", __FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, "%s Cannot get the country code\n", __func__);
}
vos_mem_copy(p2pChannel.countryString, pBuf, sizeof(pBuf));
@@ -898,7 +898,7 @@
pMac->p2pContext[i].P2PListenChannel = P2P_OPERATING_CHANNEL;
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"Invalid P2P Listen Channel in config. Switch to default Listen Channel %d\n",
- __FUNCTION__, P2P_OPERATING_CHANNEL);
+ __func__, P2P_OPERATING_CHANNEL);
}
if(csrRoamIsChannelValid(pMac, pParam->P2POperatingChannel))
@@ -910,7 +910,7 @@
pMac->p2pContext[i].P2POperatingChannel = P2P_OPERATING_CHANNEL;
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
"Invalid P2P Operating Channel in config. Switch to default Channel %d\n",
- __FUNCTION__, P2P_OPERATING_CHANNEL);
+ __func__, P2P_OPERATING_CHANNEL);
}
pMac->p2pContext[i].pNoA.ctWindow = pParam->P2POpPSCTWindow;
pMac->p2pContext[i].pNoA.psSelection = pParam->P2PPSSelection;
@@ -975,7 +975,7 @@
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_MED,
" %s HDDSession %d set NoA parameters. Selection %d, opp_ps %d, ctWindow %d, count %d, "
"duration %d, interval %d single NoA duration %d",
- __FUNCTION__, sessionId, pMac->p2pContext[sessionId].pNoA.psSelection,
+ __func__, sessionId, pMac->p2pContext[sessionId].pNoA.psSelection,
pNoA.opp_ps, pNoA.ctWindow, pNoA.count, pNoA.duration,
pNoA.interval, pNoA.single_noa_duration );
@@ -1014,16 +1014,16 @@
tp2pContext *p2pContext = (tp2pContext*) pContext;
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO, "%s GroupFormationPending %d PeerFound %d\n",
- __FUNCTION__, p2pContext->GroupFormationPending, p2pContext->PeerFound);
+ __func__, p2pContext->GroupFormationPending, p2pContext->PeerFound);
if (p2pContext->PeerFound)
{
p2pContext->PeerFound = FALSE;
- VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO, "%s Sending actionframe\n", __FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO, "%s Sending actionframe\n", __func__);
if (p2pContext->pSentActionFrame)
{
- VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, "%s calling p2pSendAction\n", __FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, "%s calling p2pSendAction\n", __func__);
p2pSendAction(halHandle, p2pContext->SMEsessionId, (tANI_U8 *)p2pContext->pSentActionFrame, p2pContext->ActionFrameLen);
}
}
@@ -1052,12 +1052,12 @@
tpAniSirGlobal pMac = PMAC_STRUCT( p2pContext->hHal );
p2pContext->PeerFound = TRUE;
- smsLog( pMac, LOGE, "%s Calling remain on channel \n", __FUNCTION__);
+ smsLog( pMac, LOGE, "%s Calling remain on channel \n", __func__);
status = p2pRemainOnChannel( pMac, p2pContext->SMEsessionId, p2pContext->P2PListenChannel/*pScanResult->BssDescriptor.channelId*/, P2P_REMAIN_ON_CHAN_TIMEOUT_LOW,
NULL, NULL, eP2PRemainOnChnReasonSendFrame);
if(status != eHAL_STATUS_SUCCESS)
{
- smsLog( pMac, LOGE, "%s remain on channel failed\n", __FUNCTION__);
+ smsLog( pMac, LOGE, "%s remain on channel failed\n", __func__);
}
return;
@@ -1084,14 +1084,14 @@
if(p2pContext->pSentActionFrame)
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_WARN,
- " %s actionframe timeout type %d", __FUNCTION__, p2pContext->actionFrameType);
+ " %s actionframe timeout type %d", __func__, p2pContext->actionFrameType);
pBuf = p2pContext->pSentActionFrame;
p2pContext->pSentActionFrame = NULL;
}
if(p2pContext->pNextActionFrm)
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_WARN,
- " %s next actionframe timeout type %d", __FUNCTION__, p2pContext->NextActionFrameType);
+ " %s next actionframe timeout type %d", __func__, p2pContext->NextActionFrameType);
pNextBuf = p2pContext->pNextActionFrm;
p2pContext->pNextActionFrm = NULL;
}
@@ -1117,7 +1117,7 @@
}
status = p2pFsm(p2pContext, eP2P_TRIGGER_DISCONNECTED);
p2pContext->actionFrameTimeout = TRUE;
- VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO, "%s timedout\n", __FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO, "%s timedout\n", __func__);
return;
}
@@ -1265,13 +1265,13 @@
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_MED, "%s found match on channel %d",
- __FUNCTION__, pScanResult->BssDescriptor.channelId);
+ __func__, pScanResult->BssDescriptor.channelId);
pP2pContext->formationReq.targetListenChannel = pScanResult->BssDescriptor.channelId;
if(pP2pContext->P2PListenChannel != pScanResult->BssDescriptor.channelId)
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_MED,
"%s adapt listen channel to %d",
- __FUNCTION__, pScanResult->BssDescriptor.channelId);
+ __func__, pScanResult->BssDescriptor.channelId);
p2pSetListenChannel(pMac, pP2pContext->sessionId, pScanResult->BssDescriptor.channelId);
}
vos_mem_copy(pP2pContext->formationReq.deviceAddress, pScanResult->BssDescriptor.bssId, P2P_MAC_ADDRESS_LEN);
@@ -1308,7 +1308,7 @@
}
else
{
- VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO, "%s not found match\n", __FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO, "%s not found match\n", __func__);
pP2pContext->formationReq.targetListenChannel = 0;
vos_mem_copy(pP2pContext->formationReq.deviceAddress, pP2pContext->peerMacAddress, P2P_MAC_ADDRESS_LEN);
status = eHAL_STATUS_SUCCESS;
@@ -1317,7 +1317,7 @@
}
else
{
- VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO, "%s not found match\n", __FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO, "%s not found match\n", __func__);
pP2pContext->formationReq.targetListenChannel = 0;
vos_mem_copy(pP2pContext->formationReq.deviceAddress, pP2pContext->peerMacAddress, P2P_MAC_ADDRESS_LEN);
status = eHAL_STATUS_SUCCESS;
@@ -1326,7 +1326,7 @@
sme_CancelRemainOnChannel(pMac, pP2pContext->SMEsessionId );
p2pFsm(pP2pContext, eP2P_TRIGGER_GROUP_FORMATION);
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO, " %s send action frame %d timeout %d\n",
- __FUNCTION__, actionFrameType, pP2pContext->ActionFrameSendTimeout);
+ __func__, actionFrameType, pP2pContext->ActionFrameSendTimeout);
}
else
{
@@ -1337,7 +1337,7 @@
if(status != eHAL_STATUS_SUCCESS)
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
- "%s p2pSendAction failed to send frame type %d\n", __FUNCTION__, actionFrameType);
+ "%s p2pSendAction failed to send frame type %d\n", __func__, actionFrameType);
pP2pContext->GroupFormationPending = FALSE;
return status;
}
@@ -1345,13 +1345,13 @@
if ( actionFrameType == eP2P_GONEGO_RES )
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO, "%s Calling p2pRemainOnChannel with duration"
- "%d on channel %d\n", __FUNCTION__, P2P_REMAIN_ON_CHAN_TIMEOUT, pP2pContext->P2PListenChannel);
+ "%d on channel %d\n", __func__, P2P_REMAIN_ON_CHAN_TIMEOUT, pP2pContext->P2PListenChannel);
if(p2pRemainOnChannel( pMac, pP2pContext->SMEsessionId,
pP2pContext->P2PListenChannel, P2P_REMAIN_ON_CHAN_TIMEOUT_LOW,
NULL, NULL, eP2PRemainOnChnReasonSendFrame))
{
- VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, "%s remain on channel failed\n", __FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, "%s remain on channel failed\n", __func__);
}
}
}
@@ -1378,7 +1378,7 @@
}
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO, " %s send action frame %d timeout %d\n",
- __FUNCTION__, actionFrameType, timeout);
+ __func__, actionFrameType, timeout);
if(NULL != pBuf)
{
@@ -1398,7 +1398,7 @@
tCsrRoamInfo RoamInfo;
vos_mem_zero(&RoamInfo, sizeof(tCsrRoamInfo));
- smsLog(pMac, LOGE, FL(" %s fail to start timer status %d"), __FUNCTION__, status);
+ smsLog(pMac, LOGE, FL(" %s fail to start timer status %d"), __func__, status);
//Without the timer we cannot continue
csrRoamCallCallback((tpAniSirGlobal)pP2pContext->hHal,
pP2pContext->SMEsessionId, &RoamInfo, 0,
@@ -1453,7 +1453,7 @@
(eStateDisabled != p2pContext->listenDiscoverableState) )
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO, "%s Calling RemainOnChannel with duration %d on channel %d\n",
- __FUNCTION__, p2pContext->listenDuration, p2pContext->P2PListenChannel);
+ __func__, p2pContext->listenDuration, p2pContext->P2PListenChannel);
status = p2pRemainOnChannel( p2pContext->hHal, p2pContext->SMEsessionId, p2pContext->P2PListenChannel, p2pContext->listenDuration,
p2pListenStateDiscoverableCallback, p2pContext, eP2PRemainOnChnReasonListen);
}
@@ -1477,7 +1477,7 @@
(NULL == p2pContext->p2pDiscoverCBFunc) )
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO, "%s restart listen timer expire time %d\n",
- __FUNCTION__, p2pContext->expire_time);
+ __func__, p2pContext->expire_time);
//We can restart the listening
status = palTimerStart(pMac->hHdd, p2pContext->listenTimerHandler, p2pContext->expire_time, eANI_BOOLEAN_FALSE);
if (eHAL_STATUS_SUCCESS != status)
@@ -1488,7 +1488,7 @@
else
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO, "%s not restart listen timer state (%d)\n",
- __FUNCTION__, p2pContext->state);
+ __func__, p2pContext->state);
}
return status;
@@ -1504,7 +1504,7 @@
switch (listenState)
{
case P2P_DEVICE_NOT_DISCOVERABLE:
- VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO, "%s P2P_NOT_DISCOVERABLE\n", __FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO, "%s P2P_NOT_DISCOVERABLE\n", __func__);
pMac->p2pContext[sessionId].listenDiscoverableState = eStateDisabled;
pMac->p2pContext[sessionId].DiscoverableCfg = listenState;
if (pMac->p2pContext[sessionId].state == eP2P_STATE_DISCONNECTED)
@@ -1515,18 +1515,18 @@
{
status = palTimerStop(pMac->hHdd, pMac->p2pContext[sessionId].listenTimerHandler);
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO, "%s Timer Stop status %d\n",
- __FUNCTION__, status);
+ __func__, status);
}
}
else
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_MED, "%s P2P_NOT_DISCOVERABLE not in right state (%d)",
- __FUNCTION__, pMac->p2pContext[sessionId].state);
+ __func__, pMac->p2pContext[sessionId].state);
}
break;
case P2P_DEVICE_AUTO_AVAILABILITY:
- VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO, "%s P2P_AUTO_AVAILABILITY\n",__FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO, "%s P2P_AUTO_AVAILABILITY\n",__func__);
pMac->p2pContext[sessionId].listenDiscoverableState = eStateEnabled;
pMac->p2pContext[sessionId].DiscoverableCfg = listenState;
pMac->p2pContext[sessionId].expire_time = P2P_LISTEN_TIMEOUT_AUTO * PAL_TIMER_TO_MS_UNIT;
@@ -1534,7 +1534,7 @@
if (pMac->p2pContext[sessionId].state == eP2P_STATE_DISCONNECTED)
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO, "%s Calling RemainOnChannel with diration %d on channel %d\n",
- __FUNCTION__, pMac->p2pContext[sessionId].listenDuration, pMac->p2pContext[sessionId].P2PListenChannel);
+ __func__, pMac->p2pContext[sessionId].listenDuration, pMac->p2pContext[sessionId].P2PListenChannel);
p2pRemainOnChannel( pMac, pMac->p2pContext[sessionId].SMEsessionId, pMac->p2pContext[sessionId].P2PListenChannel,
pMac->p2pContext[sessionId].listenDuration, p2pListenStateDiscoverableCallback,
&pMac->p2pContext[sessionId], eP2PRemainOnChnReasonListen);
@@ -1542,12 +1542,12 @@
else
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_MED, "%s P2P_AUTO_DISCOVERABLE not in right state (%d)",
- __FUNCTION__, pMac->p2pContext[sessionId].state);
+ __func__, pMac->p2pContext[sessionId].state);
}
break;
case P2P_DEVICE_HIGH_AVAILABILITY:
- VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO, "%s P2P_HIGH_AVAILABILITY\n",__FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO, "%s P2P_HIGH_AVAILABILITY\n",__func__);
pMac->p2pContext[sessionId].listenDiscoverableState = eStateEnabled;
pMac->p2pContext[sessionId].DiscoverableCfg = listenState;
pMac->p2pContext[sessionId].expire_time = P2P_REMAIN_ON_CHAN_TIMEOUT_LOW * PAL_TIMER_TO_MS_UNIT;
@@ -1555,7 +1555,7 @@
if (pMac->p2pContext[sessionId].state == eP2P_STATE_DISCONNECTED)
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO, "%s Calling RemainOnChannel with diration %d on channel %d\n",
- __FUNCTION__, pMac->p2pContext[sessionId].listenDuration, pMac->p2pContext[sessionId].P2PListenChannel);
+ __func__, pMac->p2pContext[sessionId].listenDuration, pMac->p2pContext[sessionId].P2PListenChannel);
p2pRemainOnChannel( pMac, pMac->p2pContext[sessionId].SMEsessionId, pMac->p2pContext[sessionId].P2PListenChannel,
pMac->p2pContext[sessionId].listenDuration, p2pListenStateDiscoverableCallback,
&pMac->p2pContext[sessionId], eP2PRemainOnChnReasonListen);
@@ -1563,12 +1563,12 @@
else
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_MED, "%s P2P_HIGH_DISCOVERABLE not in right state (%d)",
- __FUNCTION__, pMac->p2pContext[sessionId].state);
+ __func__, pMac->p2pContext[sessionId].state);
}
break;
case 234: //Not to use this as it enabling GO to be concurrent with P2P device P2P_DEVICE_HIGH_AVAILABILITY:
- VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO, "%s P2P_HIGH_AVAILABILITY\n",__FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO, "%s P2P_HIGH_AVAILABILITY\n",__func__);
pMac->p2pContext[sessionId].listenDiscoverableState = eStateEnabled;
pMac->p2pContext[sessionId].DiscoverableCfg = listenState;
@@ -1587,7 +1587,7 @@
if (pMac->p2pContext[sessionId].state == eP2P_STATE_DISCONNECTED)
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO, "%s Calling RemainOnChannel with diration %d on channel %d\n",
- __FUNCTION__, pMac->p2pContext[sessionId].listenDuration, pMac->p2pContext[sessionId].P2PListenChannel);
+ __func__, pMac->p2pContext[sessionId].listenDuration, pMac->p2pContext[sessionId].P2PListenChannel);
p2pRemainOnChannel( pMac, pMac->p2pContext[sessionId].SMEsessionId, pMac->p2pContext[sessionId].P2PListenChannel,
pMac->p2pContext[sessionId].listenDuration, p2pListenStateDiscoverableCallback,
&pMac->p2pContext[sessionId], eP2PRemainOnChnReasonListen);
@@ -1597,7 +1597,7 @@
default:
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
- "%s Unknown listen setting",__FUNCTION__, listenState);
+ "%s Unknown listen setting",__func__, listenState);
break;
}
@@ -1622,7 +1622,7 @@
tp2pContext *p2pContext = (tp2pContext*) pContext;
eHalStatus status = eHAL_STATUS_SUCCESS;
- VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_MED, "%s enter", __FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_MED, "%s enter", __func__);
p2pCallDiscoverCallback(p2pContext,
(p2pContext->directedDiscovery) ? eP2P_DIRECTED_DISCOVER : eP2P_DISCOVER_SUCCESS);
@@ -1676,7 +1676,7 @@
if(NULL == bssid)
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
- " %s fail to allocate bssid", __FUNCTION__);
+ " %s fail to allocate bssid", __func__);
status = eHAL_STATUS_RESOURCES;
break;
}
@@ -1699,7 +1699,7 @@
if(NULL == pFilter->SSIDs.SSIDList)
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
- " %s fail to allocate bssid", __FUNCTION__);
+ " %s fail to allocate bssid", __func__);
status = eHAL_STATUS_RESOURCES;
break;
}
@@ -1812,7 +1812,7 @@
{
if (pDiscoverRequest->uNumDeviceFilters)
{
- VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO, "%s directed\n", __FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO, "%s directed\n", __func__);
fDirect = TRUE;
uNumDeviceFilters = pDiscoverRequest->uNumDeviceFilters;
@@ -1831,7 +1831,7 @@
if(NULL == pP2pContext->directedDiscoveryFilter)
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
- "%s fail to allocate memory for discoverFilter", __FUNCTION__);
+ "%s fail to allocate memory for discoverFilter", __func__);
status = eHAL_STATUS_RESOURCES;
break;
}
@@ -1847,7 +1847,7 @@
if(!HAL_STATUS_SUCCESS(status = p2pGetResultFilter(pP2pContext, &filter)))
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
- "%s fail to create filter", __FUNCTION__);
+ "%s fail to create filter", __func__);
break;
}
}//if(NULL != pDeviceFilters)
@@ -1856,7 +1856,7 @@
if (hScanResult)
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
- "%s calling p2pDiscoverCompleteCallback\n", __FUNCTION__);
+ "%s calling p2pDiscoverCompleteCallback\n", __func__);
if (callback)
{
callback(hHal, pContext, eP2P_DIRECTED_DISCOVER);
@@ -1868,7 +1868,7 @@
else
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
- "%s Directed find did not find BSSID in cache\n", __FUNCTION__);
+ "%s Directed find did not find BSSID in cache\n", __func__);
pP2pContext->formationReq.targetListenChannel = 0;
if (pDiscoverRequest->uNumDeviceFilters == 1 && filter.BSSIDs.numOfBSSIDs == 1)
{
@@ -1888,17 +1888,17 @@
else
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_MED,
- "%s while group formation", __FUNCTION__);
+ "%s while group formation", __func__);
}
pP2pContext->uDiscoverTimeout = pDiscoverRequest->uDiscoverTimeout;
- VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_MED, "%s Start discover", __FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_MED, "%s Start discover", __func__);
status = palTimerStart(pMac->hHdd, pP2pContext->discoverTimer,
pP2pContext->uDiscoverTimeout * 1000, eANI_BOOLEAN_FALSE);
if(!HAL_STATUS_SUCCESS(status))
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
- "%s failt to start discover timer", __FUNCTION__);
+ "%s failt to start discover timer", __func__);
pP2pContext->p2pDiscoverCBFunc = NULL;
pP2pContext->pContext = NULL;
if(callback)
@@ -1947,13 +1947,13 @@
scanRequest.ChannelInfo.numOfChannels = 1;
scanRequest.ChannelInfo.ChannelList = &Channel;
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, "%s Scan on channel %d p2pContext->sessionId %d\n",
- __FUNCTION__, Channel, p2pContext->sessionId);
+ __func__, Channel, p2pContext->sessionId);
}
else
{
getChannelInfo(p2pContext, &scanRequest.ChannelInfo, WFD_DISCOVER_TYPE_AUTO);
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, "%s Scan on all channels\n",
- __FUNCTION__);
+ __func__);
}
/* set the scan type to active */
@@ -2087,7 +2087,7 @@
else
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
- " %s fail with invalid channel %d", __FUNCTION__, channel);
+ " %s fail with invalid channel %d", __func__, channel);
status = eHAL_STATUS_INVALID_PARAMETER;
}
@@ -2104,11 +2104,11 @@
status = palTimerStop(pMac->hHdd, pMac->p2pContext[SessionID].discoverTimer);
if (status != eHAL_STATUS_SUCCESS)
{
- VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, "%s Timer Stop status %d\n", __FUNCTION__, status);
+ VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, "%s Timer Stop status %d\n", __func__, status);
return status;
}
- VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO, "%s Timer Stop status %d\n", __FUNCTION__, status);
+ VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO, "%s Timer Stop status %d\n", __func__, status);
p2pCallDiscoverCallback(&pMac->p2pContext[SessionID], eP2P_DIRECTED_DISCOVER);
status = p2pFsm( &pMac->p2pContext[SessionID], eP2P_TRIGGER_DISCONNECTED );
@@ -2136,7 +2136,7 @@
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
" %s fail to parse IEs. pEntry (0x%X)",
- __FUNCTION__, pEntry);
+ __func__, pEntry);
pEntry = pNext;
continue;
}
diff --git a/CORE/SME/src/pmc/pmc.c b/CORE/SME/src/pmc/pmc.c
index ee0ae09..c6e10b7 100644
--- a/CORE/SME/src/pmc/pmc.c
+++ b/CORE/SME/src/pmc/pmc.c
@@ -2024,7 +2024,7 @@
if(!HAL_STATUS_SUCCESS(status))
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_FATAL, "%s fail to allocate memory for command (0x%X)",
- __FUNCTION__, cmdType);
+ __func__, cmdType);
pCommand = NULL;
break;
}
diff --git a/CORE/SME/src/pmc/pmcApi.c b/CORE/SME/src/pmc/pmcApi.c
index 40d44df..924f979 100644
--- a/CORE/SME/src/pmc/pmcApi.c
+++ b/CORE/SME/src/pmc/pmcApi.c
@@ -2482,20 +2482,20 @@
tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
tCsrRoamSession *pSession = CSR_GET_SESSION( pMac, sessionId );
- VOS_TRACE( VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO, "%s: IP address = %d.%d.%d.%d", __FUNCTION__,
+ VOS_TRACE( VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO, "%s: IP address = %d.%d.%d.%d", __func__,
pRequest->params.hostIpv4Addr[0], pRequest->params.hostIpv4Addr[1],
pRequest->params.hostIpv4Addr[2], pRequest->params.hostIpv4Addr[3]);
pRequestBuf = vos_mem_malloc(sizeof(tSirHostOffloadReq));
if (NULL == pRequestBuf)
{
- VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, "%s: Not able to allocate memory for host offload request", __FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, "%s: Not able to allocate memory for host offload request", __func__);
return eHAL_STATUS_FAILED_ALLOC;
}
if(NULL == pSession )
{
- VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, "%s: SESSION not Found\n", __FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, "%s: SESSION not Found\n", __func__);
return eHAL_STATUS_FAILURE;
}
@@ -2514,7 +2514,7 @@
msg.bodyptr = pRequestBuf;
if(VOS_STATUS_SUCCESS != vos_mq_post_message(VOS_MODULE_ID_WDA, &msg))
{
- VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, "%s: Not able to post WDA_SET_HOST_OFFLOAD message to WDA", __FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, "%s: Not able to post WDA_SET_HOST_OFFLOAD message to WDA", __func__);
vos_mem_free(pRequestBuf);
return eHAL_STATUS_FAILURE;
}
@@ -2539,20 +2539,20 @@
tCsrRoamSession *pSession = CSR_GET_SESSION( pMac, sessionId );
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_LOW, "%s: "
- "WDA_SET_KEEP_ALIVE message", __FUNCTION__);
+ "WDA_SET_KEEP_ALIVE message", __func__);
pRequestBuf = vos_mem_malloc(sizeof(tSirKeepAliveReq));
if (NULL == pRequestBuf)
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, "%s: "
"Not able to allocate memory for keep alive request",
- __FUNCTION__);
+ __func__);
return eHAL_STATUS_FAILED_ALLOC;
}
if(pSession == NULL )
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, "%s: "
- " Session not Found", __FUNCTION__);
+ " Session not Found", __func__);
vos_mem_free(pRequestBuf);
return eHAL_STATUS_FAILURE;
}
@@ -2577,7 +2577,7 @@
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, "%s: "
"Not able to post WDA_SET_KEEP_ALIVE message to WDA",
- __FUNCTION__);
+ __func__);
vos_mem_free(pRequestBuf);
return eHAL_STATUS_FAILURE;
}
@@ -2623,7 +2623,7 @@
pRequestBuf = vos_mem_malloc(sizeof(tSirHostOffloadReq));
if (NULL == pRequestBuf)
{
- VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, "%s: Not able to allocate memory for NS offload request", __FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, "%s: Not able to allocate memory for NS offload request", __func__);
return eHAL_STATUS_FAILED_ALLOC;
}
vos_mem_copy(pRequestBuf, pRequest, sizeof(tSirHostOffloadReq));
@@ -2633,7 +2633,7 @@
msg.bodyptr = pRequestBuf;
if(VOS_STATUS_SUCCESS != vos_mq_post_message(VOS_MODULE_ID_WDA, &msg))
{
- VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, "%s: Not able to post SIR_HAL_SET_HOST_OFFLOAD message to HAL", __FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, "%s: Not able to post SIR_HAL_SET_HOST_OFFLOAD message to HAL", __func__);
vos_mem_free(pRequestBuf);
return eHAL_STATUS_FAILURE;
}
@@ -2914,13 +2914,13 @@
tCsrRoamSession *pSession = CSR_GET_SESSION( pMac, sessionId );
tANI_U8 ucDot11Mode;
- VOS_TRACE( VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO, "%s: SSID = %s, %s", __FUNCTION__,
+ VOS_TRACE( VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO, "%s: SSID = %s, %s", __func__,
pRequest->aNetworks[0].ssId.ssId, pRequest->aNetworks[1].ssId.ssId);
pRequestBuf = vos_mem_malloc(sizeof(tSirPNOScanReq));
if (NULL == pRequestBuf)
{
- VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, "%s: Not able to allocate memory for PNO request", __FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, "%s: Not able to allocate memory for PNO request", __func__);
return eHAL_STATUS_FAILED_ALLOC;
}
@@ -2943,7 +2943,7 @@
msg.bodyptr = pRequestBuf;
if (!VOS_IS_STATUS_SUCCESS(vos_mq_post_message(VOS_MODULE_ID_WDA, &msg)))
{
- VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, "%s: Not able to post WDA_SET_PNO_REQ message to WDA", __FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, "%s: Not able to post WDA_SET_PNO_REQ message to WDA", __func__);
vos_mem_free(pRequestBuf);
return eHAL_STATUS_FAILURE;
}
@@ -2952,7 +2952,7 @@
pMac->pmc.prefNetwFoundCB = callbackRoutine;
pMac->pmc.preferredNetworkFoundIndCallbackContext = callbackContext;
- VOS_TRACE( VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO, "-%s", __FUNCTION__);
+ VOS_TRACE( VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO, "-%s", __func__);
return eHAL_STATUS_SUCCESS;
}
@@ -2966,7 +2966,7 @@
pRequestBuf = vos_mem_malloc(sizeof(tpSirSetRSSIFilterReq));
if (NULL == pRequestBuf)
{
- VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, "%s: Not able to allocate memory for PNO request", __FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, "%s: Not able to allocate memory for PNO request", __func__);
return eHAL_STATUS_FAILED_ALLOC;
}
@@ -2978,7 +2978,7 @@
msg.bodyptr = pRequestBuf;
if (!VOS_IS_STATUS_SUCCESS(vos_mq_post_message(VOS_MODULE_ID_WDA, &msg)))
{
- VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, "%s: Not able to post WDA_SET_PNO_REQ message to WDA", __FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, "%s: Not able to post WDA_SET_PNO_REQ message to WDA", __func__);
vos_mem_free(pRequestBuf);
return eHAL_STATUS_FAILURE;
}
@@ -2993,12 +2993,12 @@
vos_msg_t msg;
int i;
- VOS_TRACE( VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO, "%s started", __FUNCTION__);
+ VOS_TRACE( VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO, "%s started", __func__);
pRequestBuf = vos_mem_malloc(sizeof(tSirUpdateScanParams));
if (NULL == pRequestBuf)
{
- VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, "%s: Not able to allocate memory for UpdateScanParams request", __FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, "%s: Not able to allocate memory for UpdateScanParams request", __func__);
return eHAL_STATUS_FAILED_ALLOC;
}
@@ -3026,7 +3026,7 @@
msg.bodyptr = pRequestBuf;
if (!VOS_IS_STATUS_SUCCESS(vos_mq_post_message(VOS_MODULE_ID_WDA, &msg)))
{
- VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, "%s: Not able to post WDA_UPDATE_SCAN_PARAMS message to WDA", __FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, "%s: Not able to post WDA_UPDATE_SCAN_PARAMS message to WDA", __func__);
vos_mem_free(pRequestBuf);
return eHAL_STATUS_FAILURE;
}
@@ -3050,7 +3050,7 @@
pRequestBuf = vos_mem_malloc(sizeof(tSirSetPowerParamsReq));
if (NULL == pRequestBuf)
{
- VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, "%s: Not able to allocate memory for Power Paramrequest", __FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, "%s: Not able to allocate memory for Power Paramrequest", __func__);
return eHAL_STATUS_FAILED_ALLOC;
}
@@ -3064,7 +3064,7 @@
if(VOS_STATUS_SUCCESS != vos_mq_post_message(VOS_MODULE_ID_WDA, &msg))
{
- VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, "%s: Not able to post WDA_SET_POWER_PARAMS_REQ message to WDA", __FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, "%s: Not able to post WDA_SET_POWER_PARAMS_REQ message to WDA", __func__);
vos_mem_free(pRequestBuf);
return eHAL_STATUS_FAILURE;
}
@@ -3087,20 +3087,20 @@
tCsrRoamSession *pSession = CSR_GET_SESSION( pMac, sessionId );
VOS_TRACE( VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO,
- "%s: filterId = %d", __FUNCTION__);
+ "%s: filterId = %d", __func__);
pRequestBuf = vos_mem_malloc(sizeof(tSirRcvFltPktMatchRsp));
if (NULL == pRequestBuf)
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: Not able to allocate "
- "memory for Get PC Filter Match Count request", __FUNCTION__);
+ "memory for Get PC Filter Match Count request", __func__);
return eHAL_STATUS_FAILED_ALLOC;
}
if(NULL == pSession )
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
- "%s: Session not found ", __FUNCTION__);
+ "%s: Session not found ", __func__);
return eHAL_STATUS_FAILURE;
}
@@ -3133,7 +3133,7 @@
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: Not able to post WDA_PACKET_COALESCING_FILTER_MATCH_COUNT_REQ "
- "message to WDA", __FUNCTION__);
+ "message to WDA", __func__);
return eHAL_STATUS_FAILURE;
}
@@ -3161,19 +3161,19 @@
tCsrRoamSession *pSession = CSR_GET_SESSION( pMac, sessionId );
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, "%s: KeyReplayCounter: %d",
- __FUNCTION__, pGtkOffload->ullKeyReplayCounter);
+ __func__, pGtkOffload->ullKeyReplayCounter);
pRequestBuf = (tpSirGtkOffloadParams)vos_mem_malloc(sizeof(tSirGtkOffloadParams));
if (NULL == pRequestBuf)
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, "%s: Not able to allocate "
- "memory for GTK offload request", __FUNCTION__);
+ "memory for GTK offload request", __func__);
return eHAL_STATUS_FAILED_ALLOC;
}
if(NULL == pSession )
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
- "%s: Session not found ", __FUNCTION__);
+ "%s: Session not found ", __func__);
return eHAL_STATUS_FAILURE;
}
@@ -3193,7 +3193,7 @@
if (!VOS_IS_STATUS_SUCCESS(vos_mq_post_message(VOS_MODULE_ID_WDA, &msg)))
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, "%s: Not able to post "
- "SIR_HAL_SET_GTK_OFFLOAD message to HAL", __FUNCTION__);
+ "SIR_HAL_SET_GTK_OFFLOAD message to HAL", __func__);
vos_mem_free(pRequestBuf);
return eHAL_STATUS_FAILURE;
}
@@ -3219,20 +3219,20 @@
tCsrRoamSession *pSession = CSR_GET_SESSION( pMac, sessionId );
VOS_TRACE( VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO, "%s: filterId = %d",
- __FUNCTION__);
+ __func__);
pRequestBuf = vos_mem_malloc(sizeof(tSirGtkOffloadGetInfoRspParams));
if (NULL == pRequestBuf)
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, "%s: Not able to allocate "
- "memory for Get GTK Offload request", __FUNCTION__);
+ "memory for Get GTK Offload request", __func__);
return eHAL_STATUS_FAILED_ALLOC;
}
if(NULL == pSession )
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
- "%s: Session not found ", __FUNCTION__);
+ "%s: Session not found ", __func__);
return eHAL_STATUS_FAILURE;
}
@@ -3262,7 +3262,7 @@
if (!VOS_IS_STATUS_SUCCESS(vos_mq_post_message(VOS_MODULE_ID_WDA, &msg)))
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, "%s: Not able to post WDA_GTK_OFFLOAD_GETINFO_REQ message to WDA",
- __FUNCTION__);
+ __func__);
vos_mem_free(pRequestBuf);
return eHAL_STATUS_FAILURE;
}
diff --git a/CORE/SME/src/sme_common/sme_Api.c b/CORE/SME/src/sme_common/sme_Api.c
index c98826d..b647296 100644
--- a/CORE/SME/src/sme_common/sme_Api.c
+++ b/CORE/SME/src/sme_common/sme_Api.c
@@ -1340,7 +1340,7 @@
if (NULL == pMsg)
{
- smsLog(pMac, LOGE, "in %s msg ptr is NULL\n", __FUNCTION__);
+ smsLog(pMac, LOGE, "in %s msg ptr is NULL\n", __func__);
status = eHAL_STATUS_FAILURE;
}
else
@@ -1353,7 +1353,7 @@
pMac->pmc.FilterMatchCountCB(pMac->pmc.FilterMatchCountCBContext,
pRcvFltPktMatchRsp);
- smsLog(pMac, LOG1, "%s: status=0x%x", __FUNCTION__,
+ smsLog(pMac, LOG1, "%s: status=0x%x", __func__,
pRcvFltPktMatchRsp->status);
pMac->pmc.FilterMatchCountCB = NULL;
@@ -2855,7 +2855,7 @@
status = csrGetConfigParam(pMac, &pParam->csrConfig);
if (status != eHAL_STATUS_SUCCESS)
{
- smsLog( pMac, LOGE, "%s csrGetConfigParam failed\n", __FUNCTION__);
+ smsLog( pMac, LOGE, "%s csrGetConfigParam failed\n", __func__);
sme_ReleaseGlobalLock( &pMac->sme );
return status;
}
@@ -2863,7 +2863,7 @@
status = p2pGetConfigParam(pMac, &pParam->p2pConfig);
if (status != eHAL_STATUS_SUCCESS)
{
- smsLog( pMac, LOGE, "%s p2pGetConfigParam failed\n", __FUNCTION__);
+ smsLog( pMac, LOGE, "%s p2pGetConfigParam failed\n", __func__);
sme_ReleaseGlobalLock( &pMac->sme );
return status;
}
@@ -4897,7 +4897,7 @@
}
} while(0);
- smsLog(pMac, LOGW, "exiting function %s\n", __FUNCTION__);
+ smsLog(pMac, LOGW, "exiting function %s\n", __func__);
return(status);
}
@@ -5076,7 +5076,7 @@
if (NULL == ptrSmeBtAmpEvent)
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, "%s: "
- "Not able to allocate memory for BTAmp event", __FUNCTION__);
+ "Not able to allocate memory for BTAmp event", __func__);
return status;
}
@@ -5090,7 +5090,7 @@
if(VOS_STATUS_SUCCESS != vos_mq_post_message(VOS_MODULE_ID_WDA, &msg))
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, "%s: "
- "Not able to post SIR_HAL_SIGNAL_BTAMP_EVENT message to HAL", __FUNCTION__);
+ "Not able to post SIR_HAL_SIGNAL_BTAMP_EVENT message to HAL", __func__);
vos_mem_free(ptrSmeBtAmpEvent);
return status;
}
@@ -5337,7 +5337,7 @@
if( !pSession->sessionActive )
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
- "%s Invalid Sessionid", __FUNCTION__);
+ "%s Invalid Sessionid", __func__);
sme_ReleaseGlobalLock( &pMac->sme );
return eHAL_STATUS_FAILURE;
}
@@ -5394,7 +5394,7 @@
if( !pSession->sessionActive )
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
- "%s Invalid Sessionid", __FUNCTION__);
+ "%s Invalid Sessionid", __func__);
sme_ReleaseGlobalLock( &pMac->sme );
return eHAL_STATUS_FAILURE;
}
@@ -5476,7 +5476,7 @@
}
} while(0);
- smsLog(pMac, LOGW, "exiting function %s\n", __FUNCTION__);
+ smsLog(pMac, LOGW, "exiting function %s\n", __func__);
return(status);
}
@@ -5507,7 +5507,7 @@
pMac->p2pContext.probeRspIe = vos_mem_malloc(p2pIeLength);
if (NULL == pMac->p2pContext.probeRspIe)
{
- smsLog(pMac, LOGE, "%s: Unable to allocate P2P IE", __FUNCTION__);
+ smsLog(pMac, LOGE, "%s: Unable to allocate P2P IE", __func__);
pMac->p2pContext.probeRspIeLength = 0;
status = eHAL_STATUS_FAILURE;
}
@@ -5526,7 +5526,7 @@
sme_ReleaseGlobalLock( &pMac->sme );
}
- smsLog(pMac, LOG2, "exiting function %s\n", __FUNCTION__);
+ smsLog(pMac, LOG2, "exiting function %s\n", __func__);
return(status);
}
@@ -5555,7 +5555,7 @@
sme_ReleaseGlobalLock( &pMac->sme );
}
- smsLog(pMac, LOGW, "exiting function %s\n", __FUNCTION__);
+ smsLog(pMac, LOGW, "exiting function %s\n", __func__);
return(status);
}
@@ -5796,7 +5796,7 @@
channel = csrGetConcurrentOperationChannel( pMac );
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, "%s: "
- " Other Concurrent Channel = %d", __FUNCTION__,channel);
+ " Other Concurrent Channel = %d", __func__,channel);
sme_ReleaseGlobalLock( &pMac->sme );
}
@@ -5826,7 +5826,7 @@
if (NULL == pMsg)
{
- smsLog(pMac, LOGE, "in %s msg ptr is NULL\n", __FUNCTION__);
+ smsLog(pMac, LOGE, "in %s msg ptr is NULL\n", __func__);
status = eHAL_STATUS_FAILURE;
}
else
@@ -5834,7 +5834,7 @@
if (pPrefNetworkFoundInd->ssId.length > 0)
{
smsLog(pMac, LOG1, "Preferred Network Found Indication in %s(), SSID=%s",
- __FUNCTION__, pPrefNetworkFoundInd->ssId.ssId);
+ __func__, pPrefNetworkFoundInd->ssId.ssId);
/* Call Preferred Netowrk Found Indication callback routine. */
@@ -5846,7 +5846,7 @@
}
else
{
- smsLog(pMac, LOGE, "%s: callback failed - SSID is NULL\n", __FUNCTION__);
+ smsLog(pMac, LOGE, "%s: callback failed - SSID is NULL\n", __func__);
status = eHAL_STATUS_FAILURE;
}
}
@@ -5906,7 +5906,7 @@
pTxPerTrackingParamReq = vos_mem_malloc(sizeof(tSirTxPerTrackingParam));
if (NULL == pTxPerTrackingParamReq)
{
- VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, "%s: Not able to allocate memory for tSirTxPerTrackingParam", __FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, "%s: Not able to allocate memory for tSirTxPerTrackingParam", __func__);
return eHAL_STATUS_FAILURE;
}
@@ -5917,7 +5917,7 @@
if(VOS_STATUS_SUCCESS != vos_mq_post_message(VOS_MODULE_ID_WDA, &msg))
{
- VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, "%s: Not able to post WDA_SET_TX_PER_TRACKING_REQ message to WDA", __FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, "%s: Not able to post WDA_SET_TX_PER_TRACKING_REQ message to WDA", __func__);
vos_mem_free(pTxPerTrackingParamReq);
return eHAL_STATUS_FAILURE;
}
@@ -6072,7 +6072,7 @@
tCsrRoamSession *pSession = NULL;
VOS_TRACE( VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO, "%s: "
- "ulMulticastAddrCnt=%d, multicastAddr[0]=%d", __FUNCTION__,
+ "ulMulticastAddrCnt=%d, multicastAddr[0]=%d", __func__,
pMulticastAddrs->ulMulticastAddrCnt,
pMulticastAddrs->multicastAddr[0]);
@@ -6091,7 +6091,7 @@
if(pSession == NULL )
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, "%s: Unable to find "
- "the right session", __FUNCTION__);
+ "the right session", __func__);
return eHAL_STATUS_FAILURE;
}
@@ -6099,14 +6099,14 @@
if (NULL == pRequestBuf)
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, "%s: Not able to "
- "allocate memory for 8023 Multicast List request", __FUNCTION__);
+ "allocate memory for 8023 Multicast List request", __func__);
return eHAL_STATUS_FAILED_ALLOC;
}
if( !csrIsConnStateConnectedInfra (pMac, sessionId ))
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, "%s: Ignoring the "
- "indication as we are not connected", __FUNCTION__);
+ "indication as we are not connected", __func__);
vos_mem_free(pRequestBuf);
return eHAL_STATUS_FAILURE;
}
@@ -6122,7 +6122,7 @@
if(VOS_STATUS_SUCCESS != vos_mq_post_message(VOS_MODULE_ID_WDA, &msg))
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, "%s: Not able to "
- "post WDA_8023_MULTICAST_LIST message to WDA", __FUNCTION__);
+ "post WDA_8023_MULTICAST_LIST message to WDA", __func__);
vos_mem_free(pRequestBuf);
return eHAL_STATUS_FAILURE;
}
@@ -6141,7 +6141,7 @@
v_U8_t idx=0;
VOS_TRACE( VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO, "%s: filterType=%d, "
- "filterId = %d", __FUNCTION__,
+ "filterId = %d", __func__,
pRcvPktFilterCfg->filterType, pRcvPktFilterCfg->filterId);
allocSize = sizeof(tSirRcvPktFilterCfgType);
@@ -6151,13 +6151,13 @@
if (NULL == pRequestBuf)
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, "%s: Not able to "
- "allocate memory for Receive Filter Set Filter request", __FUNCTION__);
+ "allocate memory for Receive Filter Set Filter request", __func__);
return eHAL_STATUS_FAILED_ALLOC;
}
if( NULL == pSession )
{
- VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, "%s: Session Not found ", __FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, "%s: Session Not found ", __func__);
vos_mem_free(pRequestBuf);
return eHAL_STATUS_FAILURE;
}
@@ -6165,7 +6165,7 @@
if( !csrIsConnStateConnectedInfra (pMac, sessionId ))
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, "%s: Ignoring the "
- "indication as we are not connected", __FUNCTION__);
+ "indication as we are not connected", __func__);
vos_mem_free(pRequestBuf);
return eHAL_STATUS_FAILURE;
}
@@ -6224,7 +6224,7 @@
if(VOS_STATUS_SUCCESS != vos_mq_post_message(VOS_MODULE_ID_WDA, &msg))
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, "%s: Not able to post "
- "WDA_RECEIVE_FILTER_SET_FILTER message to WDA", __FUNCTION__);
+ "WDA_RECEIVE_FILTER_SET_FILTER message to WDA", __func__);
vos_mem_free(pRequestBuf);
return eHAL_STATUS_FAILURE;
}
@@ -6240,7 +6240,7 @@
tpAniSirGlobal pMac = PMAC_STRUCT( hHal );
eHalStatus status;
- VOS_TRACE( VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO, "+%s", __FUNCTION__);
+ VOS_TRACE( VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO, "+%s", __func__);
if ( eHAL_STATUS_SUCCESS == ( status = sme_AcquireGlobalLock( &pMac->sme)))
{
@@ -6248,7 +6248,7 @@
sme_ReleaseGlobalLock( &pMac->sme );
}
- VOS_TRACE( VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO, "-%s", __FUNCTION__);
+ VOS_TRACE( VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO, "-%s", __func__);
return (status);
}
@@ -6261,7 +6261,7 @@
tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
tCsrRoamSession *pSession = CSR_GET_SESSION( pMac, sessionId );
- VOS_TRACE( VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO, "%s: filterId = %d", __FUNCTION__,
+ VOS_TRACE( VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO, "%s: filterId = %d", __func__,
pRcvFltPktClearParam->filterId);
pRequestBuf = vos_mem_malloc(sizeof(tSirRcvFltPktClearParam));
@@ -6269,13 +6269,13 @@
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: Not able to allocate memory for Receive Filter "
- "Clear Filter request", __FUNCTION__);
+ "Clear Filter request", __func__);
return eHAL_STATUS_FAILED_ALLOC;
}
if( NULL == pSession )
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
- "%s: Session Not find ", __FUNCTION__);
+ "%s: Session Not find ", __func__);
vos_mem_free(pRequestBuf);
return eHAL_STATUS_FAILURE;
}
@@ -6283,7 +6283,7 @@
if( !csrIsConnStateConnectedInfra (pMac, sessionId ))
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, "%s: Ignoring the "
- "indication as we are not connected", __FUNCTION__);
+ "indication as we are not connected", __func__);
vos_mem_free(pRequestBuf);
return eHAL_STATUS_FAILURE;
}
@@ -6300,7 +6300,7 @@
if(VOS_STATUS_SUCCESS != vos_mq_post_message(VOS_MODULE_ID_WDA, &msg))
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, "%s: Not able to post "
- "WDA_RECEIVE_FILTER_CLEAR_FILTER message to WDA", __FUNCTION__);
+ "WDA_RECEIVE_FILTER_CLEAR_FILTER message to WDA", __func__);
vos_mem_free(pRequestBuf);
return eHAL_STATUS_FAILURE;
}
@@ -6471,7 +6471,7 @@
if (NULL == pMsg)
{
- smsLog(pMac, LOGE, "in %s msg ptr is NULL\n", __FUNCTION__);
+ smsLog(pMac, LOGE, "in %s msg ptr is NULL\n", __func__);
status = eHAL_STATUS_FAILURE;
}
else
@@ -6485,7 +6485,7 @@
pMac->pmc.wakeReasonIndCB = NULL;
pMac->pmc.wakeReasonIndCBContext = NULL;
- smsLog(pMac, LOG1, "Wake Reason Indication in %s(), reason=%d", __FUNCTION__, pWakeReasonInd->ulReason);
+ smsLog(pMac, LOG1, "Wake Reason Indication in %s(), reason=%d", __func__, pWakeReasonInd->ulReason);
}
return(status);
@@ -6516,7 +6516,7 @@
pMaxTxParams = vos_mem_malloc(sizeof(tMaxTxPowerParams));
if (NULL == pMaxTxParams)
{
- VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, "%s: Not able to allocate memory for pMaxTxParams", __FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, "%s: Not able to allocate memory for pMaxTxParams", __func__);
return eHAL_STATUS_FAILURE;
}
@@ -6531,7 +6531,7 @@
if(VOS_STATUS_SUCCESS != vos_mq_post_message(VOS_MODULE_ID_WDA, &msg))
{
- VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, "%s: Not able to post WDA_SET_MAX_TX_POWER_REQ message to WDA", __FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, "%s: Not able to post WDA_SET_MAX_TX_POWER_REQ message to WDA", __func__);
vos_mem_free(pMaxTxParams);
return eHAL_STATUS_FAILURE;
}
@@ -6615,7 +6615,7 @@
if(NULL == setTmLevelReq)
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
- "%s: Not able to allocate memory for sme_SetTmLevel", __FUNCTION__);
+ "%s: Not able to allocate memory for sme_SetTmLevel", __func__);
return eHAL_STATUS_FAILURE;
}
@@ -6629,7 +6629,7 @@
if ( !VOS_IS_STATUS_SUCCESS(vosStatus) )
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
- "%s: Post Set TM Level MSG fail", __FUNCTION__);
+ "%s: Post Set TM Level MSG fail", __func__);
vos_mem_free(setTmLevelReq);
status = eHAL_STATUS_FAILURE;
}
diff --git a/CORE/SME/src/sme_common/sme_FTApi.c b/CORE/SME/src/sme_common/sme_FTApi.c
index 61194eb..38308ee 100644
--- a/CORE/SME/src/sme_common/sme_FTApi.c
+++ b/CORE/SME/src/sme_common/sme_FTApi.c
@@ -350,7 +350,7 @@
if (pFTKeyInfo == NULL)
{
- smsLog( pMac, LOGE, "%s: pFTKeyInfo is NULL\n", __FUNCTION__);
+ smsLog( pMac, LOGE, "%s: pFTKeyInfo is NULL\n", __func__);
sme_ReleaseGlobalLock( &pMac->sme );
return eHAL_STATUS_FAILURE;
}
@@ -369,7 +369,7 @@
break;
default:
- smsLog( pMac, LOGE, "%s: Unhandled state=%d\n", __FUNCTION__,
+ smsLog( pMac, LOGE, "%s: Unhandled state=%d\n", __func__,
pMac->ft.ftSmeContext.FTState);
status = eHAL_STATUS_FAILURE;
break;
diff --git a/CORE/SVC/src/ptt/wlan_ptt_sock_svc.c b/CORE/SVC/src/ptt/wlan_ptt_sock_svc.c
index 7962f7e..8588416 100644
--- a/CORE/SVC/src/ptt/wlan_ptt_sock_svc.c
+++ b/CORE/SVC/src/ptt/wlan_ptt_sock_svc.c
@@ -89,14 +89,14 @@
static int nlmsg_seq;
if (radio < 0 || radio > ANI_MAX_RADIOS) {
PTT_TRACE(VOS_TRACE_LEVEL_ERROR, "%s: invalid radio id [%d]\n",
- __FUNCTION__, radio);
+ __func__, radio);
return -1;
}
payload_len = wmsg_length + 4; // 4 extra bytes for the radio idx
tot_msg_len = NLMSG_SPACE(payload_len);
if ((skb = dev_alloc_skb(tot_msg_len)) == NULL) {
PTT_TRACE(VOS_TRACE_LEVEL_ERROR, "%s: dev_alloc_skb() failed for msg size[%d]\n",
- __FUNCTION__, tot_msg_len);
+ __func__, tot_msg_len);
return -1;
}
nlh = NLMSG_PUT(skb, pid, nlmsg_seq++, src_mod, payload_len);
@@ -105,7 +105,7 @@
wnl->radio = radio;
memcpy(&wnl->wmsg, wmsg, wmsg_length);
PTT_TRACE(VOS_TRACE_LEVEL_INFO, "%s: Sending Msg Type [0x%X] to pid[%d]\n",
- __FUNCTION__, be16_to_cpu(wmsg->type), pid);
+ __func__, be16_to_cpu(wmsg->type), pid);
#ifdef PTT_SOCK_DEBUG_VERBOSE
ptt_sock_dump_buf((const unsigned char *)skb->data, skb->len);
#endif
@@ -135,7 +135,7 @@
ANI_NL_MSG_PUMAC, reg_req->pid) < 0)
{
PTT_TRACE(VOS_TRACE_LEVEL_ERROR, "%s: Error sending ANI_MSG_APP_REG_RSP to pid[%d]\n",
- __FUNCTION__, reg_req->pid);
+ __func__, reg_req->pid);
}
}
/*
@@ -148,12 +148,12 @@
{
case ANI_MSG_APP_REG_REQ:
PTT_TRACE(VOS_TRACE_LEVEL_INFO, "%s: Received ANI_MSG_APP_REG_REQ [0x%X]\n",
- __FUNCTION__, ani_msg_type);
+ __func__, ani_msg_type);
ptt_sock_proc_reg_req(wmsg, radio);
break;
default:
PTT_TRACE(VOS_TRACE_LEVEL_ERROR, "%s: Received Unknown Msg Type[0x%X]\n",
- __FUNCTION__, ani_msg_type);
+ __func__, ani_msg_type);
break;
}
}
@@ -171,7 +171,7 @@
VOS_STATUS vosStatus = VOS_STATUS_SUCCESS;
if (radio < 0 || radio > ANI_MAX_RADIOS) {
PTT_TRACE(VOS_TRACE_LEVEL_ERROR, "%s: ANI Msg [0x%X] invalid radio id [%d]\n",
- __FUNCTION__, ani_msg_type, radio);
+ __func__, ani_msg_type, radio);
return;
}
if(ani_msg_type == ANI_MSG_APP_REG_REQ)
@@ -185,24 +185,24 @@
case PTT_MSG_READ_REGISTER:
reg_addr = *(v_U32_t*) ((char*)wmsg + 8);
PTT_TRACE(VOS_TRACE_LEVEL_INFO, "%s: PTT_MSG_READ_REGISTER [0x%08lX]\n",
- __FUNCTION__, reg_addr);
+ __func__, reg_addr);
vosStatus = sme_DbgReadRegister(pAdapterHandle->hHal, reg_addr, ®_val);
*(v_U32_t*) ((char*)wmsg + 12) = reg_val;
if(vosStatus != VOS_STATUS_SUCCESS)
PTT_TRACE(VOS_TRACE_LEVEL_ERROR, "%s: Read Register [0x%08lX] failed!!\n",
- __FUNCTION__, reg_addr);
+ __func__, reg_addr);
ptt_sock_send_msg_to_app(wmsg, 0, ANI_NL_MSG_PUMAC, wnl->nlh.nlmsg_pid);
break;
case PTT_MSG_WRITE_REGISTER:
reg_addr = *(v_U32_t*) ((const unsigned char*)wmsg + 8);
reg_val = *(v_U32_t*)((const unsigned char*)wmsg + 12);
PTT_TRACE(VOS_TRACE_LEVEL_INFO, "%s: PTT_MSG_WRITE_REGISTER Addr [0x%08lX] value [0x%08lX]\n",
- __FUNCTION__, reg_addr, reg_val);
+ __func__, reg_addr, reg_val);
vosStatus = sme_DbgWriteRegister(pAdapterHandle->hHal, reg_addr, reg_val);
if(vosStatus != VOS_STATUS_SUCCESS)
{
PTT_TRACE(VOS_TRACE_LEVEL_ERROR, "%s: Write Register [0x%08lX] value [0x%08lX] failed!!\n",
- __FUNCTION__, reg_addr, reg_val);
+ __func__, reg_addr, reg_val);
}
//send message to the app
ptt_sock_send_msg_to_app(wmsg, 0, ANI_NL_MSG_PUMAC, wnl->nlh.nlmsg_pid);
@@ -211,12 +211,12 @@
reg_addr = *(v_U32_t*) ((char*)wmsg + 8);
len_payload = *(v_U32_t*) ((char*)wmsg + 12);
PTT_TRACE(VOS_TRACE_LEVEL_INFO, "%s: PTT_MSG_READ_MEMORY addr [0x%08lX] bytes [0x%08lX]\n",
- __FUNCTION__, reg_addr, len_payload);
+ __func__, reg_addr, len_payload);
buf = (v_U8_t*)wmsg + 16;
vosStatus = sme_DbgReadMemory(pAdapterHandle->hHal, reg_addr, buf, len_payload);
if(vosStatus != VOS_STATUS_SUCCESS) {
PTT_TRACE(VOS_TRACE_LEVEL_ERROR, "%s: Memory read failed for [0x%08lX]!!\n",
- __FUNCTION__, reg_addr);
+ __func__, reg_addr);
}
ptt_sock_swap_32(buf, len_payload);
//send message to the app
@@ -226,14 +226,14 @@
reg_addr = *(v_U32_t*) ((char*)wmsg + 8);
len_payload = *(v_U32_t*) ((char*)wmsg + 12);
PTT_TRACE(VOS_TRACE_LEVEL_INFO, "%s: PTT_MSG_DBG_WRITE_MEMORY addr [0x%08lX] bytes [0x%08lX]\n",
- __FUNCTION__, reg_addr, len_payload);
+ __func__, reg_addr, len_payload);
buf = (v_U8_t*)wmsg + 16;
ptt_sock_swap_32(buf, len_payload);
vosStatus = sme_DbgWriteMemory(pAdapterHandle->hHal, reg_addr, buf, len_payload);
if(vosStatus != VOS_STATUS_SUCCESS)
{
PTT_TRACE(VOS_TRACE_LEVEL_ERROR, "%s: Memory write failed for addr [0x%08lX]!!\n",
- __FUNCTION__, reg_addr);
+ __func__, reg_addr);
}
//send message to the app
ptt_sock_send_msg_to_app(wmsg, 0, ANI_NL_MSG_PUMAC, wnl->nlh.nlmsg_pid);
@@ -245,7 +245,7 @@
arg3 = *(unsigned int *) ((char *)wmsg + 20);
arg4 = *(unsigned int *) ((char *)wmsg + 24);
PTT_TRACE(VOS_TRACE_LEVEL_INFO, "%s: PTT_MSG_LOG_DUMP_DBG %d arg1 %d arg2 %d arg3 %d arg4 %d\n",
- __FUNCTION__, cmd, arg1, arg2, arg3, arg4);
+ __func__, cmd, arg1, arg2, arg3, arg4);
#ifdef FEATURE_WLAN_NON_INTEGRATED_SOC
// FIXME_PRIMA -- need logDump() replacement
logPrintf(pAdapterHandle->hHal, cmd, arg1, arg2, arg3, arg4);
@@ -260,7 +260,7 @@
#endif
default:
PTT_TRACE(VOS_TRACE_LEVEL_ERROR, "%s: Unknown ANI Msg [0x%X], length [0x%X]\n",
- __FUNCTION__, ani_msg_type, be16_to_cpu(wmsg->length ));
+ __func__, ani_msg_type, be16_to_cpu(wmsg->length ));
break;
}
}
diff --git a/CORE/SYS/common/src/wlan_qct_sys.c b/CORE/SYS/common/src/wlan_qct_sys.c
index b4084f9..721d424 100644
--- a/CORE/SYS/common/src/wlan_qct_sys.c
+++ b/CORE/SYS/common/src/wlan_qct_sys.c
@@ -714,7 +714,7 @@
if (NULL == hHal)
{
VOS_TRACE( VOS_MODULE_ID_SYS, VOS_TRACE_LEVEL_ERROR,
- "%s: Invalid hHal", __FUNCTION__ );
+ "%s: Invalid hHal", __func__ );
}
else
{
diff --git a/CORE/SYS/legacy/src/pal/src/palApiComm.c b/CORE/SYS/legacy/src/pal/src/palApiComm.c
index c3fc9f6..1704498 100644
--- a/CORE/SYS/legacy/src/pal/src/palApiComm.c
+++ b/CORE/SYS/legacy/src/pal/src/palApiComm.c
@@ -293,7 +293,7 @@
if (NULL == vosContext)
{
VOS_TRACE(VOS_MODULE_ID_SYS, VOS_TRACE_LEVEL_ERROR,
- "%s: invalid vosContext", __FUNCTION__);
+ "%s: invalid vosContext", __func__);
}
else
{
@@ -301,7 +301,7 @@
if (NULL == hHal)
{
VOS_TRACE(VOS_MODULE_ID_SYS, VOS_TRACE_LEVEL_ERROR,
- "%s: invalid hHal", __FUNCTION__);
+ "%s: invalid hHal", __func__);
}
else
{
diff --git a/CORE/SYS/legacy/src/system/src/sysEntryFunc.c b/CORE/SYS/legacy/src/system/src/sysEntryFunc.c
index 9efa339..6227ca9 100644
--- a/CORE/SYS/legacy/src/system/src/sysEntryFunc.c
+++ b/CORE/SYS/legacy/src/system/src/sysEntryFunc.c
@@ -285,7 +285,7 @@
if(pBD->swBdType != SMAC_SWBD_TYPE_CTLMSG)
sysLog( pMac, LOG3,
FL( "%s: RX Mesg Type %d, subType %d, MPDU Len %d, RXP Flags 0x%x\n" ),
- __FUNCTION__,
+ __func__,
mHdr->fc.type,
mHdr->fc.subType,
pBD->mpduLength,
diff --git a/CORE/TL/src/wlan_qct_tl.c b/CORE/TL/src/wlan_qct_tl.c
index d70f1dd..c85451a 100644
--- a/CORE/TL/src/wlan_qct_tl.c
+++ b/CORE/TL/src/wlan_qct_tl.c
@@ -428,7 +428,7 @@
if ( NULL == smeContext )
{
TLLOGE(VOS_TRACE( VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_ERROR,
- "%s: Invalid smeContext", __FUNCTION__));
+ "%s: Invalid smeContext", __func__));
return VOS_STATUS_E_FAULT;
}
@@ -749,7 +749,7 @@
if ( NULL == smeContext )
{
TLLOGE(VOS_TRACE( VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_ERROR,
- "%s: Invalid smeContext", __FUNCTION__));
+ "%s: Invalid smeContext", __func__));
// continue so that we can cleanup as much as possible
}
else
@@ -962,7 +962,7 @@
if(!VOS_IS_STATUS_SUCCESS(WLANTL_StartForwarding(staId,0,0)))
{
VOS_TRACE(VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_ERROR,
- " %s fails to start forwarding", __FUNCTION__);
+ " %s fails to start forwarding", __func__);
}
}
@@ -1314,7 +1314,7 @@
pwSTADescType->ucBcastSig)))
{
VOS_TRACE(VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_ERROR,
- " %s fails to start forwarding", __FUNCTION__);
+ " %s fails to start forwarding", __func__);
}
#ifdef WLAN_SOFTAP_FEATURE
}
@@ -3055,7 +3055,7 @@
if(!VOS_IS_STATUS_SUCCESS(vos_tx_mq_serialize( VOS_MQ_ID_TL, &vosMsg)))
{
VOS_TRACE(VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_ERROR,
- " %s fails to post message", __FUNCTION__);
+ " %s fails to post message", __func__);
}
return VOS_STATUS_SUCCESS;
@@ -3544,7 +3544,7 @@
if ( NULL == pMac )
{
TLLOGE(VOS_TRACE( VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_ERROR,
- "%s: Invalid pMac", __FUNCTION__));
+ "%s: Invalid pMac", __func__));
return ucResult;
}
@@ -3616,7 +3616,7 @@
else
{
TLLOGW(VOS_TRACE( VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_WARN,
- "WLAN TL:send fc out of source %s", __FUNCTION__));
+ "WLAN TL:send fc out of source %s", __func__));
ucResult = ( pTLCb->uResCount > uResLen )?VOS_TRUE:VOS_FALSE;
break; /* Out of resources or reached max len */
}
@@ -3861,7 +3861,7 @@
pTLCb->atlSTAClients[ucSTAId].ucNoMoreData = 1;
TLLOG4(VOS_TRACE( VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_INFO_LOW,
- "WLAN TL: %s get one data frame, station ID %d ", __FUNCTION__, ucSTAId));
+ "WLAN TL: %s get one data frame, station ID %d ", __func__, ucSTAId));
/*-------------------------------------------------------------------
Check to see that STA is valid and tx is not suspended
-------------------------------------------------------------------*/
@@ -3870,7 +3870,7 @@
( 0 == pTLCb->atlSTAClients[ucSTAId].fcStaTxDisabled) )
{
TLLOG4(VOS_TRACE( VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_INFO_LOW,
- "WLAN TL: %s sta id valid and not suspended ",__FUNCTION__));
+ "WLAN TL: %s sta id valid and not suspended ",__func__));
wSTAEvent = WLANTL_TX_EVENT;
pfnSTAFsm = tlSTAFsm[pTLCb->atlSTAClients[ucSTAId].tlState].
@@ -4853,7 +4853,7 @@
if ( (NULL == pTLCb) || (NULL == pvosDataBuff))
{
TLLOGE(VOS_TRACE( VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_ERROR,
- "WLAN TL:Invalid pointer in %s \n", __FUNCTION__));
+ "WLAN TL:Invalid pointer in %s \n", __func__));
return VOS_STATUS_E_FAULT;
}
vosStatus = vos_pkt_peek_data( pvosDataBuff, 0, (v_PVOID_t)&pvFcRxBd,
@@ -6690,7 +6690,7 @@
#ifdef WLAN_SOFTAP_FEATURE
TLLOG4(VOS_TRACE( VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_INFO_LOW,
- "WLAN TL %s:Sending data chain to station \n", __FUNCTION__));
+ "WLAN TL %s:Sending data chain to station \n", __func__));
if ( WLAN_STA_SOFTAP == pTLCb->atlSTAClients[ucSTAId].wSTADesc.wSTAType )
{
wRxMetaInfo.ucDesSTAId = WLAN_RX_SAP_SELF_STA_ID;
@@ -6808,7 +6808,7 @@
// destination is mc/bc station
ucDesSTAId = WLAN_RX_BCMC_STA_ID;
TLLOG4(VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_INFO_LOW,
- "%s: BC/MC packet, id %d\n", __FUNCTION__, WLAN_RX_BCMC_STA_ID));
+ "%s: BC/MC packet, id %d\n", __func__, WLAN_RX_BCMC_STA_ID));
}
else
{
@@ -6817,13 +6817,13 @@
// destination is AP itself
ucDesSTAId = WLAN_RX_SAP_SELF_STA_ID;
TLLOG4(VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_INFO_LOW,
- "%s: packet to AP itself, id %d\n", __FUNCTION__, WLAN_RX_SAP_SELF_STA_ID));
+ "%s: packet to AP itself, id %d\n", __func__, WLAN_RX_SAP_SELF_STA_ID));
}
else if (( WLAN_MAX_STA_COUNT <= ucDesSTAId ) || (pTLCb->atlSTAClients[ucDesSTAId].ucExists == 0))
{
// destination station is something else
TLLOG4(VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_INFO_LOW,
- "%s: get an station index larger than WLAN_MAX_STA_COUNT %d\n", __FUNCTION__, ucDesSTAId));
+ "%s: get an station index larger than WLAN_MAX_STA_COUNT %d\n", __func__, ucDesSTAId));
ucDesSTAId = WLAN_RX_SAP_SELF_STA_ID;
}
@@ -7778,7 +7778,7 @@
v_U8_t ucBitCheck = 1;
VOS_TRACE( VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_INFO,
- "WLAN TL: Send FC frame %s", __FUNCTION__);
+ "WLAN TL: Send FC frame %s", __func__);
/*------------------------------------------------------------------------
Sanity check
@@ -7786,7 +7786,7 @@
if ( NULL == pvosGCtx )
{
TLLOGE(VOS_TRACE( VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_ERROR,
- "WLAN TL:Invalid parameter %s", __FUNCTION__));
+ "WLAN TL:Invalid parameter %s", __func__));
return VOS_STATUS_E_INVAL;
}
/*------------------------------------------------------------------------
@@ -7797,7 +7797,7 @@
if (NULL == pTLCb)
{
TLLOGE(VOS_TRACE( VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_ERROR,
- "WLAN TL:Invalid pointer in %s \n", __FUNCTION__));
+ "WLAN TL:Invalid pointer in %s \n", __func__));
return VOS_STATUS_E_INVAL;
}
@@ -7815,7 +7815,7 @@
if( VOS_STATUS_SUCCESS != vosStatus )
{
TLLOGE(VOS_TRACE( VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_ERROR,
- "%s: failed to reserve FC TX BD %d\n",__FUNCTION__, sizeof(tHalFcTxBd)));
+ "%s: failed to reserve FC TX BD %d\n",__func__, sizeof(tHalFcTxBd)));
vos_pkt_return_packet( pPacket );
return VOS_STATUS_E_FAULT;
}
@@ -7856,7 +7856,7 @@
if( VOS_STATUS_SUCCESS != vosStatus )
{
TLLOGE(VOS_TRACE( VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_ERROR,
- "%s: Fill FC TX BD unsuccessful\n", __FUNCTION__));
+ "%s: Fill FC TX BD unsuccessful\n", __func__));
vos_pkt_return_packet( pPacket );
return VOS_STATUS_E_FAULT;
}
@@ -7864,7 +7864,7 @@
if (NULL != pTLCb->vosTxFCBuf)
{
TLLOG2(VOS_TRACE( VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_INFO_HIGH,
- "%s: Previous FC TX BD not sent\n", __FUNCTION__));
+ "%s: Previous FC TX BD not sent\n", __func__));
vos_pkt_return_packet(pTLCb->vosTxFCBuf);
}
@@ -7875,7 +7875,7 @@
vosStatus = WDA_DS_StartXmit(pvosGCtx);
TLLOG2(VOS_TRACE( VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_INFO_HIGH,
- "WLAN TL: send FC frame leave %s", __FUNCTION__));
+ "WLAN TL: send FC frame leave %s", __func__));
#endif
return VOS_STATUS_SUCCESS;
}
@@ -9063,7 +9063,7 @@
if ( NULL == pMac )
{
TLLOGE(VOS_TRACE( VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_ERROR,
- "%s: Invalid pMac", __FUNCTION__));
+ "%s: Invalid pMac", __func__));
return VOS_STATUS_E_FAULT;
}
@@ -10531,7 +10531,7 @@
if(NULL == tlCtxt)
{
- TLLOGE(VOS_TRACE(VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_ERROR, "%s Invalid TL handle", __FUNCTION__));
+ TLLOGE(VOS_TRACE(VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_ERROR, "%s Invalid TL handle", __func__));
return VOS_STATUS_E_INVAL;
}
@@ -10671,7 +10671,7 @@
if (NULL == tlCtxt)
{
VOS_TRACE( VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_ERROR,
- "Invalid TL Control Block", __FUNCTION__ );
+ "Invalid TL Control Block", __func__ );
return;
}
@@ -10978,7 +10978,7 @@
if(!VOS_IS_STATUS_SUCCESS(vos_tx_mq_serialize( VOS_MQ_ID_TL, &vosMsg)))
{
VOS_TRACE(VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_ERROR,
- " %s fails to post message", __FUNCTION__);
+ " %s fails to post message", __func__);
}
}
diff --git a/CORE/TL/src/wlan_qct_tl_ba.c b/CORE/TL/src/wlan_qct_tl_ba.c
index 9cc4fc7..c7362c0 100644
--- a/CORE/TL/src/wlan_qct_tl_ba.c
+++ b/CORE/TL/src/wlan_qct_tl_ba.c
@@ -334,7 +334,7 @@
if (NULL == pTLCb)
{
TLLOGE(VOS_TRACE(VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_ERROR,
- "%s: Invalid TL Control Block", __FUNCTION__));
+ "%s: Invalid TL Control Block", __func__));
return;
}
@@ -658,7 +658,7 @@
if(!VOS_IS_STATUS_SUCCESS(lockStatus))
{
TLLOGE(VOS_TRACE(VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_ERROR,
- "Unable to acquire reorder vos lock in %s\n", __FUNCTION__));
+ "Unable to acquire reorder vos lock in %s\n", __func__));
return lockStatus;
}
pTLCb->atlSTAClients[ucSTAId].atlBAReorderInfo[ucTid].ucExists = 0;
diff --git a/CORE/TL/src/wlan_qct_tl_hosupport.c b/CORE/TL/src/wlan_qct_tl_hosupport.c
index 9e714cb..4f4a2d8 100644
--- a/CORE/TL/src/wlan_qct_tl_hosupport.c
+++ b/CORE/TL/src/wlan_qct_tl_hosupport.c
@@ -218,7 +218,7 @@
{
TLLOGE(VOS_TRACE(VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_ERROR,
"%s: Invalid TL Context",
- __FUNCTION__));
+ __func__));
return;
}
@@ -1839,7 +1839,7 @@
pMsg = vos_mem_malloc(sizeof(WLANTL_TlIndicationReq));
if ( NULL == pMsg )
{
- VOS_TRACE( VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_ERROR, "In %s, failed to allocate mem for req", __FUNCTION__);
+ VOS_TRACE( VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_ERROR, "In %s, failed to allocate mem for req", __func__);
return VOS_STATUS_E_NOMEM;
}
@@ -1858,7 +1858,7 @@
if(VOS_STATUS_SUCCESS != vos_mq_post_message(VOS_MQ_ID_SME, &msg))
{
- VOS_TRACE( VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_ERROR, "In %s, failed to post msg to self", __FUNCTION__);
+ VOS_TRACE( VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_ERROR, "In %s, failed to post msg to self", __func__);
vos_mem_free(pMsg);
status = VOS_STATUS_E_FAILURE;
}
diff --git a/CORE/VOSS/inc/i_vos_trace.h b/CORE/VOSS/inc/i_vos_trace.h
index bdd7237..d6c20f5 100644
--- a/CORE/VOSS/inc/i_vos_trace.h
+++ b/CORE/VOSS/inc/i_vos_trace.h
@@ -96,7 +96,7 @@
#define VOS_ASSERT( _condition ) \
if ( ! ( _condition ) ) \
{ \
- printk(KERN_CRIT "VOS ASSERT in %s Line %d\n", __FUNCTION__, __LINE__); \
+ printk(KERN_CRIT "VOS ASSERT in %s Line %d\n", __func__, __LINE__); \
WARN_ON(1); \
}
@@ -116,7 +116,7 @@
#define VOS_BUG( _condition ) \
if ( ! ( _condition ) ) \
{ \
- printk(KERN_CRIT "VOS BUG in %s Line %d\n", __FUNCTION__, __LINE__); \
+ printk(KERN_CRIT "VOS BUG in %s Line %d\n", __func__, __LINE__); \
BUG_ON(1); \
}
@@ -125,7 +125,7 @@
#define VOS_BUG( _condition ) \
if ( ! ( _condition ) ) \
{ \
- printk(KERN_CRIT "VOS BUG in %s Line %d\n", __FUNCTION__, __LINE__); \
+ printk(KERN_CRIT "VOS BUG in %s Line %d\n", __func__, __LINE__); \
WARN_ON(1); \
}
diff --git a/CORE/VOSS/src/vos_api.c b/CORE/VOSS/src/vos_api.c
index 8cca0d1..40ad564 100644
--- a/CORE/VOSS/src/vos_api.c
+++ b/CORE/VOSS/src/vos_api.c
@@ -685,7 +685,7 @@
if (gpVosContext != pVosContext)
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: mismatch in context", __FUNCTION__);
+ "%s: mismatch in context", __func__);
return VOS_STATUS_E_FAILURE;
}
@@ -695,13 +695,13 @@
{
if (pVosContext->pBALContext == NULL)
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: BAL NULL context", __FUNCTION__);
+ "%s: BAL NULL context", __func__);
else if (pVosContext->pMACContext == NULL)
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: MAC NULL context", __FUNCTION__);
+ "%s: MAC NULL context", __func__);
else
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: TL NULL context", __FUNCTION__);
+ "%s: TL NULL context", __func__);
return VOS_STATUS_E_FAILURE;
}
@@ -711,13 +711,13 @@
{
if (pVosContext->pWDAContext == NULL)
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: WDA NULL context", __FUNCTION__);
+ "%s: WDA NULL context", __func__);
else if (pVosContext->pMACContext == NULL)
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: MAC NULL context", __FUNCTION__);
+ "%s: MAC NULL context", __func__);
else
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: TL NULL context", __FUNCTION__);
+ "%s: TL NULL context", __func__);
return VOS_STATUS_E_FAILURE;
}
@@ -1177,14 +1177,14 @@
if (pVosContext == NULL)
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: vos context pointer is null", __FUNCTION__);
+ "%s: vos context pointer is null", __func__);
return NULL;
}
if (gpVosContext != pVosContext)
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: pVosContext != gpVosContext", __FUNCTION__);
+ "%s: pVosContext != gpVosContext", __func__);
return NULL;
}
@@ -1315,7 +1315,7 @@
if (gpVosContext == NULL)
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: global voss context is NULL", __FUNCTION__);
+ "%s: global voss context is NULL", __func__);
}
return gpVosContext;
@@ -1328,7 +1328,7 @@
if (gpVosContext == NULL)
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: global voss context is NULL", __FUNCTION__);
+ "%s: global voss context is NULL", __func__);
return 1;
}
@@ -1340,7 +1340,7 @@
if (gpVosContext == NULL)
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: global voss context is NULL", __FUNCTION__);
+ "%s: global voss context is NULL", __func__);
return;
}
@@ -1352,7 +1352,7 @@
if (gpVosContext == NULL)
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: global voss context is NULL", __FUNCTION__);
+ "%s: global voss context is NULL", __func__);
return 0;
}
@@ -1364,7 +1364,7 @@
if (gpVosContext == NULL)
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: global voss context is NULL", __FUNCTION__);
+ "%s: global voss context is NULL", __func__);
return;
}
@@ -1416,13 +1416,13 @@
if ( pVosContext == NULL) {
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: vos context is null", __FUNCTION__);
+ "%s: vos context is null", __func__);
return VOS_STATUS_E_FAILURE;
}
if (( gpVosContext != pVosContext) || ( ppModuleContext == NULL)) {
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: context mismatch or null param passed", __FUNCTION__);
+ "%s: context mismatch or null param passed", __func__);
return VOS_STATUS_E_FAILURE;
}
@@ -1659,7 +1659,7 @@
if (*pGpModContext != pModuleContext)
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: pGpModContext != pModuleContext", __FUNCTION__);
+ "%s: pGpModContext != pModuleContext", __func__);
return VOS_STATUS_E_FAILURE;
}
@@ -1789,7 +1789,7 @@
if (pTargetMq == NULL)
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: pTargetMq == NULL", __FUNCTION__);
+ "%s: pTargetMq == NULL", __func__);
return VOS_STATUS_E_FAILURE;
}
@@ -1915,7 +1915,7 @@
if (pTargetMq == NULL)
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: pTargetMq == NULL", __FUNCTION__);
+ "%s: pTargetMq == NULL", __func__);
return VOS_STATUS_E_FAILURE;
}
@@ -2026,7 +2026,7 @@
if (pTargetMq == NULL)
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: pTargetMq == NULL", __FUNCTION__);
+ "%s: pTargetMq == NULL", __func__);
return VOS_STATUS_E_FAILURE;
}
@@ -2069,14 +2069,14 @@
if (gpVosContext != pUserData)
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: gpVosContext != pUserData", __FUNCTION__);
+ "%s: gpVosContext != pUserData", __func__);
return;
}
if (vos_event_set(&gpVosContext->ProbeEvent)!= VOS_STATUS_SUCCESS)
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: vos_event_set failed", __FUNCTION__);
+ "%s: vos_event_set failed", __func__);
return;
}
@@ -2092,14 +2092,14 @@
if (gpVosContext != pUserData)
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: gpVosContext != pUserData", __FUNCTION__);
+ "%s: gpVosContext != pUserData", __func__);
return;
}
if (vos_event_set(&gpVosContext->ProbeEvent)!= VOS_STATUS_SUCCESS)
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: vos_event_set failed", __FUNCTION__);
+ "%s: vos_event_set failed", __func__);
return;
}
@@ -2114,14 +2114,14 @@
if (gpVosContext != pUserData)
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: gpVosContext != pUserData", __FUNCTION__);
+ "%s: gpVosContext != pUserData", __func__);
return;
}
if (vos_event_set(&gpVosContext->wdaCompleteEvent)!= VOS_STATUS_SUCCESS)
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: vos_event_set failed", __FUNCTION__);
+ "%s: vos_event_set failed", __func__);
return;
}
@@ -2141,7 +2141,7 @@
if (gpVosContext != pVosContext)
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: gpVosContext != pVosContext", __FUNCTION__);
+ "%s: gpVosContext != pVosContext", __func__);
return;
}
@@ -2150,7 +2150,7 @@
if (pMsgWrapper == NULL)
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: pMsgWrapper == NULL in function", __FUNCTION__);
+ "%s: pMsgWrapper == NULL in function", __func__);
return;
}
@@ -2182,7 +2182,7 @@
{
if (pTLConfig == NULL)
{
- VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, "%s NULL ptr passed in!", __FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, "%s NULL ptr passed in!", __func__);
return;
}
diff --git a/CORE/VOSS/src/vos_event.c b/CORE/VOSS/src/vos_event.c
index 05c858a..7a387a3 100644
--- a/CORE/VOSS/src/vos_event.c
+++ b/CORE/VOSS/src/vos_event.c
@@ -111,7 +111,7 @@
if ( NULL == event )
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_FATAL,
- "NULL event passed into %s", __FUNCTION__);
+ "NULL event passed into %s", __func__);
VOS_ASSERT(0);
return VOS_STATUS_E_FAULT;
}
@@ -120,7 +120,7 @@
if ( LINUX_EVENT_COOKIE == event->cookie )
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_FATAL,
- "Initialized event passed into %s", __FUNCTION__);
+ "Initialized event passed into %s", __func__);
VOS_ASSERT(0);
return VOS_STATUS_E_BUSY;
}
@@ -166,7 +166,7 @@
if ( NULL == event )
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_FATAL,
- "NULL event passed into %s", __FUNCTION__);
+ "NULL event passed into %s", __func__);
VOS_ASSERT(0);
return VOS_STATUS_E_FAULT;
}
@@ -175,7 +175,7 @@
if ( LINUX_EVENT_COOKIE != event->cookie )
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_FATAL,
- "Uninitialized event passed into %s", __FUNCTION__);
+ "Uninitialized event passed into %s", __func__);
VOS_ASSERT(0);
return VOS_STATUS_E_INVAL;
}
@@ -221,7 +221,7 @@
if ( NULL == event )
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_FATAL,
- "NULL event passed into %s", __FUNCTION__);
+ "NULL event passed into %s", __func__);
VOS_ASSERT(0);
return VOS_STATUS_E_FAULT;
}
@@ -230,7 +230,7 @@
if ( LINUX_EVENT_COOKIE != event->cookie )
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_FATAL,
- "Uninitialized event passed into %s", __FUNCTION__);
+ "Uninitialized event passed into %s", __func__);
VOS_ASSERT(0);
return VOS_STATUS_E_INVAL;
}
@@ -340,7 +340,7 @@
if ( NULL == event )
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_FATAL,
- "NULL event passed into %s", __FUNCTION__);
+ "NULL event passed into %s", __func__);
VOS_ASSERT(0);
return VOS_STATUS_E_FAULT;
}
@@ -349,7 +349,7 @@
if ( LINUX_EVENT_COOKIE != event->cookie )
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_FATAL,
- "Uninitialized event passed into %s", __FUNCTION__);
+ "Uninitialized event passed into %s", __func__);
VOS_ASSERT(0);
return VOS_STATUS_E_INVAL;
}
@@ -395,7 +395,7 @@
if (in_interrupt())
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_FATAL,
- "%s cannot be called from interrupt context!!!", __FUNCTION__);
+ "%s cannot be called from interrupt context!!!", __func__);
VOS_ASSERT(0);
return VOS_STATUS_E_FAULT;
}
@@ -404,7 +404,7 @@
if ( NULL == event )
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_FATAL,
- "NULL event passed into %s", __FUNCTION__);
+ "NULL event passed into %s", __func__);
VOS_ASSERT(0);
return VOS_STATUS_E_FAULT;
}
@@ -413,7 +413,7 @@
if ( LINUX_EVENT_COOKIE != event->cookie )
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_FATAL,
- "Uninitialized event passed into %s", __FUNCTION__);
+ "Uninitialized event passed into %s", __func__);
VOS_ASSERT(0);
return VOS_STATUS_E_INVAL;
}
diff --git a/CORE/VOSS/src/vos_list.c b/CORE/VOSS/src/vos_list.c
index 51adbab..12382dc 100644
--- a/CORE/VOSS/src/vos_list.c
+++ b/CORE/VOSS/src/vos_list.c
@@ -59,14 +59,14 @@
if ( pList == NULL)
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: NULL pointer passed in", __FUNCTION__);
+ "%s: NULL pointer passed in", __func__);
return VOS_STATUS_E_FAULT;
}
if ( pList->cookie == VOS_LIST_COOKIE )
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: already initialized list", __FUNCTION__);
+ "%s: already initialized list", __func__);
return VOS_STATUS_E_BUSY;
}
@@ -87,14 +87,14 @@
if (pList == NULL)
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: NULL pointer passed in", __FUNCTION__);
+ "%s: NULL pointer passed in", __func__);
return VOS_STATUS_E_FAULT;
}
if ( pList->cookie != VOS_LIST_COOKIE )
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: list not initialized", __FUNCTION__);
+ "%s: list not initialized", __func__);
return VOS_STATUS_E_INVAL;
}
@@ -102,14 +102,14 @@
if (rc)
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: unable to lock list", __FUNCTION__);
+ "%s: unable to lock list", __func__);
return VOS_STATUS_E_FAULT;
}
if ( pList->count !=0 )
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: list length not equal to zero", __FUNCTION__);
+ "%s: list length not equal to zero", __func__);
mutex_unlock(&pList->lock);
return VOS_STATUS_E_BUSY;
}
@@ -129,14 +129,14 @@
if ( ( pList == NULL) || ( pNode == NULL) )
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: NULL pointer passed in", __FUNCTION__);
+ "%s: NULL pointer passed in", __func__);
return VOS_STATUS_E_FAULT;
}
if ( pList->cookie != VOS_LIST_COOKIE )
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: list not initialized", __FUNCTION__);
+ "%s: list not initialized", __func__);
return VOS_STATUS_E_INVAL;
}
@@ -144,7 +144,7 @@
if (rc)
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: unable to lock list", __FUNCTION__);
+ "%s: unable to lock list", __func__);
return VOS_STATUS_E_FAULT;
}
@@ -163,14 +163,14 @@
if ( ( pList == NULL) || ( pNode == NULL) )
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: NULL pointer passed in", __FUNCTION__);
+ "%s: NULL pointer passed in", __func__);
return VOS_STATUS_E_FAULT;
}
if ( pList->cookie != VOS_LIST_COOKIE )
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: list not initialized", __FUNCTION__);
+ "%s: list not initialized", __func__);
return VOS_STATUS_E_INVAL;
}
@@ -178,7 +178,7 @@
if (rc)
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: unable to lock list", __FUNCTION__);
+ "%s: unable to lock list", __func__);
return VOS_STATUS_E_FAULT;
}
@@ -197,14 +197,14 @@
if ( ( pList == NULL) || ( pNode == NULL) || (pSize == NULL) )
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: NULL pointer passed in", __FUNCTION__);
+ "%s: NULL pointer passed in", __func__);
return VOS_STATUS_E_FAULT;
}
if ( pList->cookie != VOS_LIST_COOKIE )
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: list not initialized", __FUNCTION__);
+ "%s: list not initialized", __func__);
return VOS_STATUS_E_INVAL;
}
@@ -212,7 +212,7 @@
if (rc)
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: unable to lock list", __FUNCTION__);
+ "%s: unable to lock list", __func__);
return VOS_STATUS_E_FAULT;
}
@@ -236,14 +236,14 @@
if ( ( pList == NULL ) || ( ppNode == NULL) )
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: NULL pointer passed in", __FUNCTION__);
+ "%s: NULL pointer passed in", __func__);
return VOS_STATUS_E_FAULT;
}
if ( pList->cookie != VOS_LIST_COOKIE )
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: list not initialized", __FUNCTION__);
+ "%s: list not initialized", __func__);
return VOS_STATUS_E_INVAL;
}
@@ -251,14 +251,14 @@
if (rc)
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: unable to lock list", __FUNCTION__);
+ "%s: unable to lock list", __func__);
return VOS_STATUS_E_FAULT;
}
if ( list_empty( &pList->anchor ) )
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_INFO_HIGH,
- "%s: list empty", __FUNCTION__);
+ "%s: list empty", __func__);
mutex_unlock(&pList->lock);
return VOS_STATUS_E_EMPTY;
}
@@ -286,14 +286,14 @@
if ( ( pList == NULL ) || ( ppNode == NULL) )
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: NULL pointer passed in", __FUNCTION__);
+ "%s: NULL pointer passed in", __func__);
return VOS_STATUS_E_FAULT;
}
if ( pList->cookie != VOS_LIST_COOKIE )
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: list not initialized", __FUNCTION__);
+ "%s: list not initialized", __func__);
return VOS_STATUS_E_INVAL;
}
@@ -301,14 +301,14 @@
if (rc)
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: unable to lock list", __FUNCTION__);
+ "%s: unable to lock list", __func__);
return VOS_STATUS_E_FAULT;
}
if ( list_empty( &pList->anchor ) )
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_WARN,
- "%s: list empty", __FUNCTION__);
+ "%s: list empty", __func__);
mutex_unlock(&pList->lock);
return VOS_STATUS_E_EMPTY;
}
@@ -331,14 +331,14 @@
if ( ( pList ==NULL) || ( pSize == NULL) )
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: NULL pointer passed in", __FUNCTION__);
+ "%s: NULL pointer passed in", __func__);
return VOS_STATUS_E_FAULT;
}
if ( pList->cookie != VOS_LIST_COOKIE )
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: list not initialized", __FUNCTION__);
+ "%s: list not initialized", __func__);
return VOS_STATUS_E_INVAL;
}
@@ -346,7 +346,7 @@
if (rc)
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: unable to lock list", __FUNCTION__);
+ "%s: unable to lock list", __func__);
return VOS_STATUS_E_FAULT;
}
@@ -393,14 +393,14 @@
if ( ( pList == NULL) || ( ppNode == NULL) )
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: NULL pointer passed in", __FUNCTION__);
+ "%s: NULL pointer passed in", __func__);
return VOS_STATUS_E_FAULT;
}
if ( pList->cookie != VOS_LIST_COOKIE )
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: list not initialized", __FUNCTION__);
+ "%s: list not initialized", __func__);
return VOS_STATUS_E_INVAL;
}
@@ -408,14 +408,14 @@
if (rc)
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: unable to lock list", __FUNCTION__);
+ "%s: unable to lock list", __func__);
return VOS_STATUS_E_FAULT;
}
if ( list_empty(&pList->anchor) )
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_WARN,
- "%s: list empty", __FUNCTION__);
+ "%s: list empty", __func__);
mutex_unlock(&pList->lock);
return VOS_STATUS_E_EMPTY;
}
@@ -463,14 +463,14 @@
if ( ( pList == NULL) || ( ppNode == NULL) )
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: NULL pointer passed in", __FUNCTION__);
+ "%s: NULL pointer passed in", __func__);
return VOS_STATUS_E_FAULT;
}
if ( pList->cookie != VOS_LIST_COOKIE )
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: list not initialized", __FUNCTION__);
+ "%s: list not initialized", __func__);
return VOS_STATUS_E_INVAL;
}
@@ -478,14 +478,14 @@
if (rc)
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: unable to lock list", __FUNCTION__);
+ "%s: unable to lock list", __func__);
return VOS_STATUS_E_FAULT;
}
if ( list_empty(&pList->anchor) )
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_WARN,
- "%s: list empty", __FUNCTION__);
+ "%s: list empty", __func__);
mutex_unlock(&pList->lock);
return VOS_STATUS_E_EMPTY;
}
@@ -536,14 +536,14 @@
if ( ( pList == NULL) || ( pNode == NULL) || (ppNode == NULL))
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: NULL pointer passed in", __FUNCTION__);
+ "%s: NULL pointer passed in", __func__);
return VOS_STATUS_E_FAULT;
}
if ( pList->cookie != VOS_LIST_COOKIE )
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: list not initialized", __FUNCTION__);
+ "%s: list not initialized", __func__);
return VOS_STATUS_E_INVAL;
}
@@ -551,14 +551,14 @@
if (rc)
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: unable to lock list", __FUNCTION__);
+ "%s: unable to lock list", __func__);
return VOS_STATUS_E_FAULT;
}
if ( list_empty(&pList->anchor) )
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_INFO,
- "%s: list empty", __FUNCTION__);
+ "%s: list empty", __func__);
mutex_unlock(&pList->lock);
return VOS_STATUS_E_EMPTY;
}
@@ -579,7 +579,7 @@
if (listptr == &pList->anchor)
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_INFO,
- "%s: list empty", __FUNCTION__);
+ "%s: list empty", __func__);
mutex_unlock(&pList->lock);
return VOS_STATUS_E_EMPTY;
}
@@ -630,14 +630,14 @@
if ( ( pList == NULL) || ( pNode == NULL) || (ppNode == NULL) )
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: NULL pointer passed in", __FUNCTION__);
+ "%s: NULL pointer passed in", __func__);
return VOS_STATUS_E_FAULT;
}
if ( pList->cookie != VOS_LIST_COOKIE )
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: list not initialized", __FUNCTION__);
+ "%s: list not initialized", __func__);
return VOS_STATUS_E_INVAL;
}
@@ -645,14 +645,14 @@
if (rc)
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: unable to lock list", __FUNCTION__);
+ "%s: unable to lock list", __func__);
return VOS_STATUS_E_FAULT;
}
if ( list_empty(&pList->anchor) )
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_WARN,
- "%s: list empty", __FUNCTION__);
+ "%s: list empty", __func__);
mutex_unlock(&pList->lock);
return VOS_STATUS_E_EMPTY;
}
@@ -674,7 +674,7 @@
if (listptr == &pList->anchor)
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_WARN,
- "%s: list empty", __FUNCTION__);
+ "%s: list empty", __func__);
mutex_unlock(&pList->lock);
return VOS_STATUS_E_EMPTY;
}
@@ -721,13 +721,13 @@
if ( ( pList == NULL) || ( pNode == NULL) || (pNodeToInsert == NULL))
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: NULL pointer passed in", __FUNCTION__);
+ "%s: NULL pointer passed in", __func__);
return VOS_STATUS_E_FAULT;
}
if ( pList->cookie != VOS_LIST_COOKIE )
{
- VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, "%s: list not initialized", __FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, "%s: list not initialized", __func__);
return VOS_STATUS_E_INVAL;
}
@@ -735,13 +735,13 @@
if (rc)
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: unable to lock list", __FUNCTION__);
+ "%s: unable to lock list", __func__);
return VOS_STATUS_E_FAULT;
}
if ( list_empty(&pList->anchor) )
{
- VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, "%s: list empty", __FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, "%s: list empty", __func__);
mutex_unlock(&pList->lock);
return VOS_STATUS_E_EMPTY;
}
@@ -801,14 +801,14 @@
if ( ( pList == NULL) || ( pNode == NULL) || (pNodeToInsert == NULL))
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: NULL pointer passed in", __FUNCTION__);
+ "%s: NULL pointer passed in", __func__);
return VOS_STATUS_E_FAULT;
}
if ( pList->cookie != VOS_LIST_COOKIE )
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: list not initialized", __FUNCTION__);
+ "%s: list not initialized", __func__);
return VOS_STATUS_E_INVAL;
}
@@ -816,7 +816,7 @@
if (rc)
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: unable to lock list", __FUNCTION__);
+ "%s: unable to lock list", __func__);
return VOS_STATUS_E_FAULT;
}
@@ -824,7 +824,7 @@
if ( list_empty(&pList->anchor) )
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: list empty", __FUNCTION__);
+ "%s: list empty", __func__);
mutex_unlock(&pList->lock);
return VOS_STATUS_E_EMPTY;
}
@@ -882,14 +882,14 @@
if ( ( pList == NULL ) || ( pNodeToRemove == NULL) )
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: NULL pointer passed in", __FUNCTION__);
+ "%s: NULL pointer passed in", __func__);
return VOS_STATUS_E_FAULT;
}
if ( pList->cookie != VOS_LIST_COOKIE )
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: list not initialized", __FUNCTION__);
+ "%s: list not initialized", __func__);
return VOS_STATUS_E_INVAL;
}
@@ -897,14 +897,14 @@
if (rc)
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: unable to lock list", __FUNCTION__);
+ "%s: unable to lock list", __func__);
return VOS_STATUS_E_FAULT;
}
if ( list_empty(&pList->anchor) )
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: list empty", __FUNCTION__);
+ "%s: list empty", __func__);
mutex_unlock(&pList->lock);
return VOS_STATUS_E_EMPTY;
}
diff --git a/CORE/VOSS/src/vos_lock.c b/CORE/VOSS/src/vos_lock.c
index 5087c28..be253d5 100644
--- a/CORE/VOSS/src/vos_lock.c
+++ b/CORE/VOSS/src/vos_lock.c
@@ -119,19 +119,19 @@
//check for invalid pointer
if ( lock == NULL)
{
- VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, "%s: NULL pointer passed in",__FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, "%s: NULL pointer passed in",__func__);
return VOS_STATUS_E_FAULT;
}
// check for 'already initialized' lock
if ( LINUX_LOCK_COOKIE == lock->cookie )
{
- VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, "%s: already initialized lock",__FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, "%s: already initialized lock",__func__);
return VOS_STATUS_E_BUSY;
}
if (in_interrupt())
{
- VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, "%s cannot be called from interrupt context!!!", __FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, "%s cannot be called from interrupt context!!!", __func__);
return VOS_STATUS_E_FAULT;
}
@@ -175,19 +175,19 @@
//Check for invalid pointer
if ( lock == NULL )
{
- VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, "%s: NULL pointer passed in",__FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, "%s: NULL pointer passed in",__func__);
return VOS_STATUS_E_FAULT;
}
// check if lock refers to an initialized object
if ( LINUX_LOCK_COOKIE != lock->cookie )
{
- VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, "%s: uninitialized lock",__FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, "%s: uninitialized lock",__func__);
return VOS_STATUS_E_INVAL;
}
if (in_interrupt())
{
- VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, "%s cannot be called from interrupt context!!!", __FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, "%s cannot be called from interrupt context!!!", __func__);
return VOS_STATUS_E_FAULT;
}
if ((lock->processID == current->pid) &&
@@ -205,7 +205,7 @@
if (rc == 0)
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: unable to lock mutex (rc = %d)", __FUNCTION__, rc);
+ "%s: unable to lock mutex (rc = %d)", __func__, rc);
return VOS_STATUS_E_FAILURE;
}
@@ -223,7 +223,7 @@
else
{
// lock is already destroyed
- VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, "%s: Lock is already destroyed", __FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, "%s: Lock is already destroyed", __func__);
mutex_unlock(&lock->m_lock);
return VOS_STATUS_E_FAILURE;
}
@@ -263,20 +263,20 @@
//Check for invalid pointer
if ( lock == NULL )
{
- VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, "%s: NULL pointer passed in",__FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, "%s: NULL pointer passed in",__func__);
return VOS_STATUS_E_FAULT;
}
// check if lock refers to an uninitialized object
if ( LINUX_LOCK_COOKIE != lock->cookie )
{
- VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, "%s: uninitialized lock",__FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, "%s: uninitialized lock",__func__);
return VOS_STATUS_E_INVAL;
}
if (in_interrupt())
{
- VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, "%s cannot be called from interrupt context!!!", __FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, "%s cannot be called from interrupt context!!!", __func__);
return VOS_STATUS_E_FAULT;
}
@@ -285,7 +285,7 @@
// of the thread which acquire the lock
if ( lock->processID != current->pid )
{
- VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, "%s: current task pid does not match original task pid!!",__FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, "%s: current task pid does not match original task pid!!",__func__);
#ifdef VOS_NESTED_LOCK_DEBUG
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_INFO,"%s: Lock held by=%d being released by=%d", __func__, lock->processID, current->pid);
#endif
@@ -351,26 +351,26 @@
//Check for invalid pointer
if ( NULL == lock )
{
- VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, "%s: NULL pointer passed in", __FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, "%s: NULL pointer passed in", __func__);
return VOS_STATUS_E_FAULT;
}
if ( LINUX_LOCK_COOKIE != lock->cookie )
{
- VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, "%s: uninitialized lock", __FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, "%s: uninitialized lock", __func__);
return VOS_STATUS_E_INVAL;
}
if (in_interrupt())
{
- VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, "%s cannot be called from interrupt context!!!", __FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, "%s cannot be called from interrupt context!!!", __func__);
return VOS_STATUS_E_FAULT;
}
// check if lock is released
if (!mutex_trylock(&lock->m_lock))
{
- VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, "%s: lock is not released", __FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, "%s: lock is not released", __func__);
return VOS_STATUS_E_BUSY;
}
lock->cookie = 0;
diff --git a/CORE/VOSS/src/vos_memory.c b/CORE/VOSS/src/vos_memory.c
index fef6093..0395608 100644
--- a/CORE/VOSS/src/vos_memory.c
+++ b/CORE/VOSS/src/vos_memory.c
@@ -113,7 +113,7 @@
struct s_vos_mem_struct* memStruct;
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: List is not Empty. listSize %d ", __FUNCTION__, (int)listSize);
+ "%s: List is not Empty. listSize %d ", __func__, (int)listSize);
do
{
@@ -147,13 +147,13 @@
if (size > (1024*1024))
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: called with arg > 1024K; passed in %d !!!", __FUNCTION__,size);
+ "%s: called with arg > 1024K; passed in %d !!!", __func__,size);
return NULL;
}
if (in_interrupt())
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s is being called in interrupt context, using GPF_ATOMIC.", __FUNCTION__);
+ "%s is being called in interrupt context, using GPF_ATOMIC.", __func__);
return kmalloc(size, GFP_ATOMIC);
}
@@ -179,7 +179,7 @@
if(VOS_STATUS_SUCCESS != vosStatus)
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: Unable to insert node into List vosStatus %d\n", __FUNCTION__, vosStatus);
+ "%s: Unable to insert node into List vosStatus %d\n", __func__, vosStatus);
}
memPtr = (v_VOID_t*)(memStruct + 1);
@@ -217,7 +217,7 @@
else
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_FATAL,
- "%s: Unallocated memory (double free?)", __FUNCTION__);
+ "%s: Unallocated memory (double free?)", __func__);
VOS_ASSERT(0);
}
}
@@ -230,12 +230,12 @@
#endif
if (size > (1024*1024))
{
- VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, "%s: called with arg > 1024K; passed in %d !!!", __FUNCTION__,size);
+ VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, "%s: called with arg > 1024K; passed in %d !!!", __func__,size);
return NULL;
}
if (in_interrupt())
{
- VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, "%s cannot be called from interrupt context!!!", __FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, "%s cannot be called from interrupt context!!!", __func__);
return NULL;
}
#ifdef CONFIG_WCNSS_MEM_PRE_ALLOC
@@ -256,7 +256,7 @@
if (in_interrupt())
{
- VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, "%s cannot be called from interrupt context!!!", __FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, "%s cannot be called from interrupt context!!!", __func__);
return;
}
#ifdef CONFIG_WCNSS_MEM_PRE_ALLOC
@@ -272,7 +272,7 @@
{
if (ptr == NULL)
{
- VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, "%s called with NULL parameter ptr", __FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, "%s called with NULL parameter ptr", __func__);
return;
}
memset(ptr, value, numBytes);
@@ -288,7 +288,7 @@
if (ptr == NULL)
{
- VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, "%s called with NULL parameter ptr", __FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, "%s called with NULL parameter ptr", __func__);
return;
}
memset(ptr, 0, numBytes);
@@ -312,7 +312,7 @@
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
"%s called with NULL parameter, source:%p destination:%p",
- __FUNCTION__, pSrc, pDst);
+ __func__, pSrc, pDst);
VOS_ASSERT(0);
return;
}
@@ -334,7 +334,7 @@
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
"%s called with NULL parameter, source:%p destination:%p",
- __FUNCTION__, pSrc, pDst);
+ __func__, pSrc, pDst);
VOS_ASSERT(0);
return;
}
@@ -353,7 +353,7 @@
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
"%s called with NULL parameter, p1:%p p2:%p",
- __FUNCTION__, pMemory1, pMemory2);
+ __func__, pMemory1, pMemory2);
VOS_ASSERT(0);
return VOS_FALSE;
}
@@ -400,7 +400,7 @@
if (in_interrupt())
{
- VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, "%s cannot be called from interrupt context!!!", __FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, "%s cannot be called from interrupt context!!!", __func__);
return NULL;
}
@@ -425,7 +425,7 @@
if(VOS_STATUS_SUCCESS != vosStatus)
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: Unable to insert node into List vosStatus %d\n", __FUNCTION__, vosStatus);
+ "%s: Unable to insert node into List vosStatus %d\n", __func__, vosStatus);
}
memPtr = (v_VOID_t*)(memStruct + 1);
@@ -468,7 +468,7 @@
{
if (in_interrupt())
{
- VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, "%s cannot be called from interrupt context!!!", __FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, "%s cannot be called from interrupt context!!!", __func__);
return NULL;
}
return kmalloc(size, GFP_KERNEL);
diff --git a/CORE/VOSS/src/vos_mq.c b/CORE/VOSS/src/vos_mq.c
index d6ffd01..b033cc2 100644
--- a/CORE/VOSS/src/vos_mq.c
+++ b/CORE/VOSS/src/vos_mq.c
@@ -77,7 +77,7 @@
/* Some quick sanity check*/
if (pMq == NULL) {
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: NULL pointer passed",__FUNCTION__);
+ "%s: NULL pointer passed",__func__);
return VOS_STATUS_E_FAILURE;
}
@@ -115,7 +115,7 @@
*/
if (pMq == NULL) {
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: NULL pointer passed",__FUNCTION__);
+ "%s: NULL pointer passed",__func__);
return ;
}
@@ -148,7 +148,7 @@
*/
if ((pMq == NULL) || (pMsgWrapper == NULL)) {
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: NULL pointer passed",__FUNCTION__);
+ "%s: NULL pointer passed",__func__);
return ;
}
@@ -187,7 +187,7 @@
if (pMq == NULL) {
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: NULL pointer passed",__FUNCTION__);
+ "%s: NULL pointer passed",__func__);
return NULL;
}
@@ -196,7 +196,7 @@
if( list_empty(&pMq->mqList) )
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_WARN,
- "%s: VOS Message Queue is empty",__FUNCTION__);
+ "%s: VOS Message Queue is empty",__func__);
}
else
{
@@ -236,7 +236,7 @@
if (pMq == NULL)
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: NULL pointer passed",__FUNCTION__);
+ "%s: NULL pointer passed",__func__);
return VOS_STATUS_E_FAILURE;
}
diff --git a/CORE/VOSS/src/vos_nvitem.c b/CORE/VOSS/src/vos_nvitem.c
index e539e38..6898924 100644
--- a/CORE/VOSS/src/vos_nvitem.c
+++ b/CORE/VOSS/src/vos_nvitem.c
@@ -488,7 +488,7 @@
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_FATAL,
"%s: unable to download NV file %s",
- __FUNCTION__, WLAN_NV_FILE);
+ __func__, WLAN_NV_FILE);
return VOS_STATUS_E_RESOURCES;
}
@@ -499,7 +499,7 @@
if (NULL == pnvEFSTable)
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s : failed to allocate memory for NV", __FUNCTION__);
+ "%s : failed to allocate memory for NV", __func__);
return VOS_STATUS_E_NOMEM;
}
@@ -986,7 +986,7 @@
if (VNV_TYPE_COUNT <= type)
{
VOS_TRACE( VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- ("%s: invalid type=%d"), __FUNCTION__, type );
+ ("%s: invalid type=%d"), __func__, type );
return VOS_STATUS_E_INVAL;
}
// read the validity bitmap
@@ -1039,7 +1039,7 @@
if (VNV_TYPE_COUNT <= type)
{
VOS_TRACE( VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- ("%s: invalid type=%d"), __FUNCTION__, type );
+ ("%s: invalid type=%d"), __func__, type );
return VOS_STATUS_E_INVAL;
}
*pItemIsValid = (v_BOOL_t)((nvValidityBitmap >> type) & 1);
@@ -1075,7 +1075,7 @@
if (VNV_TYPE_COUNT <= type)
{
VOS_TRACE( VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- ("%s: invalid type=%d"), __FUNCTION__, type );
+ ("%s: invalid type=%d"), __func__, type );
return VOS_STATUS_E_INVAL;
}
if (NULL == outputVoidBuffer)
@@ -1310,7 +1310,7 @@
if (VNV_TYPE_COUNT <= type)
{
VOS_TRACE( VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- ("%s: invalid type=%d"), __FUNCTION__, type );
+ ("%s: invalid type=%d"), __func__, type );
return VOS_STATUS_E_INVAL;
}
if (NULL == inputVoidBuffer)
diff --git a/CORE/VOSS/src/vos_packet.c b/CORE/VOSS/src/vos_packet.c
index 3894217..cf84918 100644
--- a/CORE/VOSS/src/vos_packet.c
+++ b/CORE/VOSS/src/vos_packet.c
@@ -328,7 +328,7 @@
struct vos_pkt_t *pPkt;
struct list_head *pFreeList;
- VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_INFO, "Enter:%s",__FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_INFO, "Enter:%s",__func__);
do
{
@@ -504,7 +504,7 @@
VOS_STATUS vos_packet_close( v_PVOID_t pVosContext )
{
- VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_INFO, "Enter:%s",__FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_INFO, "Enter:%s",__func__);
if (unlikely(NULL == pVosContext))
{
diff --git a/CORE/VOSS/src/vos_sched.c b/CORE/VOSS/src/vos_sched.c
index f19e45f..91b38b8 100644
--- a/CORE/VOSS/src/vos_sched.c
+++ b/CORE/VOSS/src/vos_sched.c
@@ -371,7 +371,7 @@
if (Arg == NULL)
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: Bad Args passed", __FUNCTION__);
+ "%s: Bad Args passed", __func__);
return 0;
}
set_user_nice(current, -2);
@@ -409,7 +409,7 @@
if(retWaitStatus == -ERESTARTSYS)
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: wait_event_interruptible returned -ERESTARTSYS", __FUNCTION__);
+ "%s: wait_event_interruptible returned -ERESTARTSYS", __func__);
break;
}
clear_bit(MC_POST_EVENT_MASK, &pSchedContext->mcEventFlag);
@@ -451,7 +451,7 @@
if (pMsgWrapper == NULL)
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: pMsgWrapper is NULL", __FUNCTION__);
+ "%s: pMsgWrapper is NULL", __func__);
VOS_ASSERT(0);
break;
}
@@ -461,7 +461,7 @@
if(pWdiMsg == NULL || pWdiMsg->callback == NULL)
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: WDI Msg or Callback is NULL", __FUNCTION__);
+ "%s: WDI Msg or Callback is NULL", __func__);
VOS_ASSERT(0);
break;
}
@@ -487,7 +487,7 @@
if (pMsgWrapper == NULL)
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: pMsgWrapper is NULL", __FUNCTION__);
+ "%s: pMsgWrapper is NULL", __func__);
VOS_ASSERT(0);
break;
}
@@ -513,7 +513,7 @@
if (pMsgWrapper == NULL)
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: pMsgWrapper is NULL", __FUNCTION__);
+ "%s: pMsgWrapper is NULL", __func__);
VOS_ASSERT(0);
break;
}
@@ -538,7 +538,7 @@
if(pMacContext == NULL)
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_FATAL,
- "%s: pMacContext is NULL", __FUNCTION__);
+ "%s: pMacContext is NULL", __func__);
VOS_ASSERT(0);
break;
}
@@ -550,7 +550,7 @@
if (pMsgWrapper == NULL)
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: pMsgWrapper is NULL", __FUNCTION__);
+ "%s: pMsgWrapper is NULL", __func__);
VOS_ASSERT(0);
break;
}
@@ -577,7 +577,7 @@
if (NULL == pMsgWrapper)
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: pMsgWrapper is NULL", __FUNCTION__);
+ "%s: pMsgWrapper is NULL", __func__);
VOS_ASSERT(0);
break;
}
@@ -612,7 +612,7 @@
if (NULL == pMsgWrapper)
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: pMsgWrapper is NULL", __FUNCTION__);
+ "%s: pMsgWrapper is NULL", __func__);
VOS_ASSERT(0);
break;
}
@@ -647,7 +647,7 @@
if (pMsgWrapper == NULL)
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: pMsgWrapper is NULL", __FUNCTION__);
+ "%s: pMsgWrapper is NULL", __func__);
VOS_ASSERT(0);
break;
}
@@ -683,7 +683,7 @@
} // while TRUE
// If we get here the MC thread must exit
VOS_TRACE( VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_INFO,
- "%s: MC Thread exiting!!!!", __FUNCTION__);
+ "%s: MC Thread exiting!!!!", __func__);
complete_and_exit(&pSchedContext->McShutdown, 0);
} /* VosMCThread() */
int isWDresetInProgress(void)
@@ -725,7 +725,7 @@
if (Arg == NULL)
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: Bad Args passed", __FUNCTION__);
+ "%s: Bad Args passed", __func__);
return 0;
}
daemonize("WD_Thread");
@@ -745,7 +745,7 @@
if(retWaitStatus == -ERESTARTSYS)
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: wait_event_interruptible returned -ERESTARTSYS", __FUNCTION__);
+ "%s: wait_event_interruptible returned -ERESTARTSYS", __func__);
break;
}
clear_bit(WD_POST_EVENT_MASK, &pWdContext->wdEventFlag);
@@ -819,12 +819,12 @@
// If we get here the Watchdog thread must exit
VOS_TRACE( VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_INFO,
- "%s: Watchdog Thread exiting !!!!", __FUNCTION__);
+ "%s: Watchdog Thread exiting !!!!", __func__);
complete_and_exit(&pWdContext->WdShutdown, 0);
err_reset:
VOS_TRACE( VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_FATAL,
- "%s: Watchdog Thread Failed to Reset, Exiting!!!!", __FUNCTION__);
+ "%s: Watchdog Thread Failed to Reset, Exiting!!!!", __func__);
return 0;
} /* VosMCThread() */
@@ -857,7 +857,7 @@
if (Arg == NULL)
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s Bad Args passed", __FUNCTION__);
+ "%s Bad Args passed", __func__);
return 0;
}
daemonize("TX_Thread");
@@ -895,7 +895,7 @@
if(retWaitStatus == -ERESTARTSYS)
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: wait_event_interruptible returned -ERESTARTSYS", __FUNCTION__);
+ "%s: wait_event_interruptible returned -ERESTARTSYS", __func__);
break;
}
clear_bit(TX_POST_EVENT_MASK, &pSchedContext->txEventFlag);
@@ -927,7 +927,7 @@
if (pMsgWrapper == NULL)
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: pMsgWrapper is NULL", __FUNCTION__);
+ "%s: pMsgWrapper is NULL", __func__);
VOS_ASSERT(0);
break;
}
@@ -952,7 +952,7 @@
if (pMsgWrapper == NULL)
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: pMsgWrapper is NULL", __FUNCTION__);
+ "%s: pMsgWrapper is NULL", __func__);
VOS_ASSERT(0);
break;
}
@@ -980,7 +980,7 @@
if (pMsgWrapper == NULL)
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: pMsgWrapper is NULL", __FUNCTION__);
+ "%s: pMsgWrapper is NULL", __func__);
VOS_ASSERT(0);
break;
}
@@ -990,7 +990,7 @@
if(pWdiMsg == NULL || pWdiMsg->callback == NULL)
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: WDI Msg or Callback is NULL", __FUNCTION__);
+ "%s: WDI Msg or Callback is NULL", __func__);
VOS_ASSERT(0);
break;
}
@@ -1013,7 +1013,7 @@
if (pMsgWrapper == NULL)
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: pMsgWrapper is NULL", __FUNCTION__);
+ "%s: pMsgWrapper is NULL", __func__);
VOS_ASSERT(0);
break;
}
@@ -1051,7 +1051,7 @@
} // while TRUE
// If we get here the TX thread must exit
VOS_TRACE( VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_INFO,
- "%s: TX Thread exiting!!!!", __FUNCTION__);
+ "%s: TX Thread exiting!!!!", __func__);
complete_and_exit(&pSchedContext->TxShutdown, 0);
} /* VosTxThread() */
@@ -1084,7 +1084,7 @@
if (Arg == NULL)
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s Bad Args passed", __FUNCTION__);
+ "%s Bad Args passed", __func__);
return 0;
}
daemonize("RX_Thread");
@@ -1121,7 +1121,7 @@
if(retWaitStatus == -ERESTARTSYS)
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: wait_event_interruptible returned -ERESTARTSYS", __FUNCTION__);
+ "%s: wait_event_interruptible returned -ERESTARTSYS", __func__);
break;
}
clear_bit(RX_POST_EVENT_MASK, &pSchedContext->rxEventFlag);
@@ -1155,7 +1155,7 @@
if (pMsgWrapper == NULL)
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: pMsgWrapper is NULL", __FUNCTION__);
+ "%s: pMsgWrapper is NULL", __func__);
VOS_ASSERT(0);
break;
}
@@ -1182,7 +1182,7 @@
if ((NULL == pMsgWrapper) || (NULL == pMsgWrapper->pVosMsg))
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: wdiRxMq message is NULL", __FUNCTION__);
+ "%s: wdiRxMq message is NULL", __func__);
VOS_ASSERT(0);
// we won't return this wrapper since it is corrupt
}
@@ -1192,7 +1192,7 @@
if ((NULL == pWdiMsg) || (NULL == pWdiMsg->callback))
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: WDI Msg or callback is NULL", __FUNCTION__);
+ "%s: WDI Msg or callback is NULL", __func__);
VOS_ASSERT(0);
}
else
@@ -1228,7 +1228,7 @@
} // while TRUE
// If we get here the RX thread must exit
VOS_TRACE( VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_INFO,
- "%s: RX Thread exiting!!!!", __FUNCTION__);
+ "%s: RX Thread exiting!!!!", __func__);
complete_and_exit(&pSchedContext->RxShutdown, 0);
} /* VosRxThread() */
#endif
@@ -1253,11 +1253,11 @@
VOS_STATUS vos_sched_close ( v_PVOID_t pVosContext )
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_INFO_HIGH,
- "%s: invoked", __FUNCTION__);
+ "%s: invoked", __func__);
if (gpVosSchedContext == NULL)
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: gpVosSchedContext == NULL\n",__FUNCTION__);
+ "%s: gpVosSchedContext == NULL\n",__func__);
return VOS_STATUS_E_FAILURE;
}
@@ -1307,11 +1307,11 @@
VOS_STATUS vos_watchdog_close ( v_PVOID_t pVosContext )
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_INFO_HIGH,
- "%s: vos_watchdog closing now", __FUNCTION__);
+ "%s: vos_watchdog closing now", __func__);
if (gpVosWatchdogContext == NULL)
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: gpVosWatchdogContext is NULL\n",__FUNCTION__);
+ "%s: gpVosWatchdogContext is NULL\n",__func__);
return VOS_STATUS_E_FAILURE;
}
set_bit(WD_SHUTDOWN_EVENT_MASK, &gpVosWatchdogContext->wdEventFlag);
@@ -1331,11 +1331,11 @@
struct sdio_func *sdio_func_dev = NULL;
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_FATAL,
- "%s: vos_watchdog resetting WLAN", __FUNCTION__);
+ "%s: vos_watchdog resetting WLAN", __func__);
if (gpVosWatchdogContext == NULL)
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_FATAL,
- "%s: Watchdog not enabled. LOGP ignored.",__FUNCTION__);
+ "%s: Watchdog not enabled. LOGP ignored.",__func__);
return VOS_STATUS_E_FAILURE;
}
@@ -1368,7 +1368,7 @@
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_FATAL,
"%s: Reset already in Progress. Ignoring signaling Watchdog",
- __FUNCTION__);
+ __func__);
/* Release the lock here */
spin_unlock(&gpVosWatchdogContext->wdLock);
return VOS_STATUS_E_FAILURE;
@@ -1377,7 +1377,7 @@
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_FATAL,
"%s: LOGP already in Progress. Ignoring signaling Watchdog",
- __FUNCTION__);
+ __func__);
/* Release the lock here */
spin_unlock(&gpVosWatchdogContext->wdLock);
return VOS_STATUS_E_FAILURE;
@@ -1399,7 +1399,7 @@
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_FATAL,
"%s: Load/unload in Progress. Ignoring signaling Watchdog",
- __FUNCTION__);
+ __func__);
return VOS_STATUS_E_FAILURE;
}
@@ -1710,7 +1710,7 @@
if (NULL == pSchedContext)
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: pSchedContext is NULL", __FUNCTION__);
+ "%s: pSchedContext is NULL", __func__);
return;
}
@@ -1718,7 +1718,7 @@
if (NULL == vosCtx)
{
VOS_TRACE( VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: vosCtx is NULL", __FUNCTION__);
+ "%s: vosCtx is NULL", __func__);
return;
}
@@ -1751,7 +1751,7 @@
{
VOS_TRACE( VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_INFO,
"%s: Freeing MC WDA MSG message type %d",
- __FUNCTION__, pMsgWrapper->pVosMsg->type );
+ __func__, pMsgWrapper->pVosMsg->type );
if (pMsgWrapper->pVosMsg->bodyptr) {
vos_mem_free((v_VOID_t*)pMsgWrapper->pVosMsg->bodyptr);
}
@@ -1770,7 +1770,7 @@
{
VOS_TRACE( VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_INFO,
"%s: Freeing MC WDI MSG message type %d",
- __FUNCTION__, pMsgWrapper->pVosMsg->type );
+ __func__, pMsgWrapper->pVosMsg->type );
if (pMsgWrapper->pVosMsg->bodyptr) {
vos_mem_free((v_VOID_t*)pMsgWrapper->pVosMsg->bodyptr);
}
@@ -1835,7 +1835,7 @@
if (NULL == pSchedContext)
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: pSchedContext is NULL", __FUNCTION__);
+ "%s: pSchedContext is NULL", __func__);
return;
}
@@ -1902,7 +1902,7 @@
if (NULL == pSchedContext)
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: pSchedContext is NULL", __FUNCTION__);
+ "%s: pSchedContext is NULL", __func__);
return;
}
@@ -1937,7 +1937,7 @@
if (gpVosSchedContext == NULL)
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: gpVosSchedContext == NULL",__FUNCTION__);
+ "%s: gpVosSchedContext == NULL",__func__);
return 0;
}
return ((gpVosSchedContext->TxThread) && (threadID == gpVosSchedContext->TxThread->pid));
@@ -1953,7 +1953,7 @@
if (gpVosSchedContext == NULL)
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: gpVosSchedContext == NULL",__FUNCTION__);
+ "%s: gpVosSchedContext == NULL",__func__);
return 0;
}
return ((gpVosSchedContext->RxThread) && (threadID == gpVosSchedContext->RxThread->pid));
@@ -1968,7 +1968,7 @@
if (gpVosSchedContext == NULL)
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: gpVosSchedContext == NULL",__FUNCTION__);
+ "%s: gpVosSchedContext == NULL",__func__);
}
return (gpVosSchedContext);
}
@@ -1981,7 +1981,7 @@
if (gpVosWatchdogContext == NULL)
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: gpVosWatchdogContext == NULL",__FUNCTION__);
+ "%s: gpVosWatchdogContext == NULL",__func__);
}
return (gpVosWatchdogContext);
}
@@ -2005,11 +2005,11 @@
hdd_context_t *pHddCtx = NULL;
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_FATAL,
- "%s: WLAN driver is shutting down ", __FUNCTION__);
+ "%s: WLAN driver is shutting down ", __func__);
if (NULL == gpVosWatchdogContext)
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_FATAL,
- "%s: Watchdog not enabled. LOGP ignored.", __FUNCTION__);
+ "%s: Watchdog not enabled. LOGP ignored.", __func__);
return VOS_STATUS_E_FAILURE;
}
@@ -2018,7 +2018,7 @@
if (NULL == pHddCtx)
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_FATAL,
- "%s: Invalid HDD Context", __FUNCTION__);
+ "%s: Invalid HDD Context", __func__);
return VOS_STATUS_E_FAILURE;
}
@@ -2030,7 +2030,7 @@
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_FATAL,
"%s: Shutdown already in Progress. Ignoring signaling Watchdog",
- __FUNCTION__);
+ __func__);
/* Release the lock here */
spin_unlock(&gpVosWatchdogContext->wdLock);
return VOS_STATUS_E_FAILURE;
@@ -2041,7 +2041,7 @@
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_FATAL,
"%s: shutdown/re-init already in Progress. Ignoring signaling Watchdog",
- __FUNCTION__);
+ __func__);
/* Release the lock here */
spin_unlock(&gpVosWatchdogContext->wdLock);
return VOS_STATUS_E_FAILURE;
@@ -2058,7 +2058,7 @@
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_FATAL,
"%s: Load/unload in Progress. Ignoring signaling Watchdog",
- __FUNCTION__);
+ __func__);
/* wcnss has crashed, and SSR has alredy been started by Kernel driver.
* So disable SSR from WLAN driver */
hdd_set_ssr_required( HDD_SSR_DISABLED );
diff --git a/CORE/VOSS/src/vos_threads.c b/CORE/VOSS/src/vos_threads.c
index cf1dea3..bc56e6b 100644
--- a/CORE/VOSS/src/vos_threads.c
+++ b/CORE/VOSS/src/vos_threads.c
@@ -76,7 +76,7 @@
{
if (in_interrupt())
{
- VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, "%s cannot be called from interrupt context!!!", __FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, "%s cannot be called from interrupt context!!!", __func__);
return;
}
msleep_interruptible(msInterval);
@@ -102,7 +102,7 @@
unsigned long timeout = usecs_to_jiffies(usInterval) + 1;
if (in_interrupt())
{
- VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, "%s cannot be called from interrupt context!!!", __FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, "%s cannot be called from interrupt context!!!", __func__);
return;
}
while (timeout && !signal_pending(current))
diff --git a/CORE/VOSS/src/vos_timer.c b/CORE/VOSS/src/vos_timer.c
index a77580b..e2db7d4 100644
--- a/CORE/VOSS/src/vos_timer.c
+++ b/CORE/VOSS/src/vos_timer.c
@@ -127,7 +127,7 @@
if (timer == NULL)
{
- VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, "%s Null pointer passed in!",__FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, "%s Null pointer passed in!",__func__);
return;
}
@@ -308,7 +308,7 @@
timer_node_t *ptimerNode;
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
"%s: List is not Empty. listSize %d ",
- __FUNCTION__, (int)listSize);
+ __func__, (int)listSize);
do
{
@@ -404,7 +404,7 @@
if ((timer == NULL) || (callback == NULL))
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: Null params being passed",__FUNCTION__);
+ "%s: Null params being passed",__func__);
VOS_ASSERT(0);
return VOS_STATUS_E_FAULT;
}
@@ -414,7 +414,7 @@
if(timer->ptimerNode == NULL)
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: Not able to allocate memory for timeNode",__FUNCTION__);
+ "%s: Not able to allocate memory for timeNode",__func__);
VOS_ASSERT(0);
return VOS_STATUS_E_FAULT;
}
@@ -431,7 +431,7 @@
if(VOS_STATUS_SUCCESS != vosStatus)
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: Unable to insert node into List vosStatus %d\n", __FUNCTION__, vosStatus);
+ "%s: Unable to insert node into List vosStatus %d\n", __func__, vosStatus);
}
// set the various members of the timer structure
@@ -457,7 +457,7 @@
if ((timer == NULL) || (callback == NULL))
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: Null params being passed",__FUNCTION__);
+ "%s: Null params being passed",__func__);
VOS_ASSERT(0);
return VOS_STATUS_E_FAULT;
}
@@ -522,7 +522,7 @@
if ( NULL == timer )
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: Null timer pointer being passed",__FUNCTION__);
+ "%s: Null timer pointer being passed",__func__);
VOS_ASSERT(0);
return VOS_STATUS_E_FAULT;
}
@@ -531,7 +531,7 @@
if ( LINUX_TIMER_COOKIE != timer->platformInfo.cookie )
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: Cannot destroy uninitialized timer",__FUNCTION__);
+ "%s: Cannot destroy uninitialized timer",__func__);
return VOS_STATUS_E_INVAL;
}
@@ -597,7 +597,7 @@
if ( NULL == timer )
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: Null timer pointer being passed",__FUNCTION__);
+ "%s: Null timer pointer being passed",__func__);
VOS_ASSERT(0);
return VOS_STATUS_E_FAULT;
}
@@ -606,7 +606,7 @@
if ( LINUX_TIMER_COOKIE != timer->platformInfo.cookie )
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: Cannot destroy uninitialized timer",__FUNCTION__);
+ "%s: Cannot destroy uninitialized timer",__func__);
return VOS_STATUS_E_INVAL;
}
spin_lock_irqsave( &timer->platformInfo.spinlock,flags );
@@ -698,7 +698,7 @@
if ( LINUX_TIMER_COOKIE != timer->platformInfo.cookie )
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: Cannot start uninitialized timer",__FUNCTION__);
+ "%s: Cannot start uninitialized timer",__func__);
VOS_ASSERT(0);
return VOS_STATUS_E_INVAL;
}
@@ -794,7 +794,7 @@
if ( LINUX_TIMER_COOKIE != timer->platformInfo.cookie )
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: Cannot stop uninitialized timer",__FUNCTION__);
+ "%s: Cannot stop uninitialized timer",__func__);
VOS_ASSERT(0);
return VOS_STATUS_E_INVAL;
}
diff --git a/CORE/VOSS/src/vos_trace.c b/CORE/VOSS/src/vos_trace.c
index 9d6636f..38ecbd5 100644
--- a/CORE/VOSS/src/vos_trace.c
+++ b/CORE/VOSS/src/vos_trace.c
@@ -127,7 +127,7 @@
// Make sure the caller is passing in a valid LEVEL.
if ( level >= VOS_TRACE_LEVEL_MAX )
{
- pr_err("%s: Invalid trace level %d passed in!\n", __FUNCTION__, level);
+ pr_err("%s: Invalid trace level %d passed in!\n", __func__, level);
return;
}
@@ -150,14 +150,14 @@
// Make sure the caller is passing in a valid LEVEL.
if ( level < 0 || level >= VOS_TRACE_LEVEL_MAX )
{
- pr_err("%s: Invalid trace level %d passed in!\n", __FUNCTION__, level);
+ pr_err("%s: Invalid trace level %d passed in!\n", __func__, level);
return;
}
// Make sure the caller is passing in a valid module.
if ( module < 0 || module >= VOS_MODULE_ID_MAX )
{
- pr_err("%s: Invalid module id %d passed in!\n", __FUNCTION__, module);
+ pr_err("%s: Invalid module id %d passed in!\n", __func__, module);
return;
}
diff --git a/CORE/VOSS/src/vos_types.c b/CORE/VOSS/src/vos_types.c
index 66cad7a..ffb7893 100644
--- a/CORE/VOSS/src/vos_types.c
+++ b/CORE/VOSS/src/vos_types.c
@@ -73,7 +73,7 @@
if (pTarget == NULL)
{
- VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, "NULL ptr passed into %s",__FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, "NULL ptr passed into %s",__func__);
return 0;
}
local_irq_save(flags);
@@ -103,7 +103,7 @@
unsigned long flags;
if (pTarget == NULL)
{
- VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, "NULL ptr passed into %s",__FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, "NULL ptr passed into %s",__func__);
return 0;
}
local_irq_save(flags);
@@ -131,7 +131,7 @@
unsigned long flags;
if (pTarget == NULL)
{
- VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, "NULL ptr passed into %s",__FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, "NULL ptr passed into %s",__func__);
return 0;
}
// return atomic_dec_return(pTarget);
@@ -146,7 +146,7 @@
unsigned long flags;
if (pTarget == NULL)
{
- VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, "NULL ptr passed into %s",__FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, "NULL ptr passed into %s",__func__);
return 0;
}
local_irq_save(flags);
@@ -160,7 +160,7 @@
unsigned long flags;
if (pTarget == NULL)
{
- VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, "NULL ptr passed into %s",__FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, "NULL ptr passed into %s",__func__);
return 0;
}
local_irq_save(flags);
diff --git a/CORE/VOSS/src/vos_utils.c b/CORE/VOSS/src/vos_utils.c
index 4ae4088..b72fb31 100644
--- a/CORE/VOSS/src/vos_utils.c
+++ b/CORE/VOSS/src/vos_utils.c
@@ -607,7 +607,7 @@
err_tfm:
//return ret;
if (ret != 0) {
- VOS_TRACE(VOS_MODULE_ID_VOSS,VOS_TRACE_LEVEL_ERROR,"%s() call failed", __FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_VOSS,VOS_TRACE_LEVEL_ERROR,"%s() call failed", __func__);
return VOS_STATUS_E_FAULT;
}
@@ -703,7 +703,7 @@
err_tfm:
//return ret;
if (ret != 0) {
- VOS_TRACE(VOS_MODULE_ID_VOSS,VOS_TRACE_LEVEL_ERROR,"%s() call failed", __FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_VOSS,VOS_TRACE_LEVEL_ERROR,"%s() call failed", __func__);
return VOS_STATUS_E_FAULT;
}
diff --git a/CORE/WDA/src/wlan_qct_wda.c b/CORE/WDA/src/wlan_qct_wda.c
index 7a6a576..344fe2b 100644
--- a/CORE/WDA/src/wlan_qct_wda.c
+++ b/CORE/WDA/src/wlan_qct_wda.c
@@ -310,20 +310,20 @@
if (NULL == pVosContext)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_FATAL,
- "%s: Invoked with invalid pVosContext", __FUNCTION__ );
+ "%s: Invoked with invalid pVosContext", __func__ );
return;
}
wdaContext = VOS_GET_WDA_CTXT(pVosContext);
if (NULL == wdaContext)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_FATAL,
- "%s: Invoked with invalid wdaContext", __FUNCTION__ );
+ "%s: Invoked with invalid wdaContext", __func__ );
return;
}
if (WDI_STATUS_SUCCESS != wdiRspParams->wdiStatus)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_FATAL,
- "%s: WDI_Start() failure reported", __FUNCTION__ );
+ "%s: WDI_Start() failure reported", __func__ );
}
else
{
@@ -357,7 +357,7 @@
if (VOS_STATUS_SUCCESS != status)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_FATAL,
- "%s: Unable to unblock WDA_start", __FUNCTION__ );
+ "%s: Unable to unblock WDA_start", __func__ );
}
return;
}
@@ -375,14 +375,14 @@
if (NULL == pVosContext)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: Invoked with invalid pVosContext", __FUNCTION__ );
+ "%s: Invoked with invalid pVosContext", __func__ );
return VOS_STATUS_E_FAILURE;
}
wdaContext = VOS_GET_WDA_CTXT(pVosContext);
if (NULL == wdaContext)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: Invoked with invalid wdaContext", __FUNCTION__ );
+ "%s: Invoked with invalid wdaContext", __func__ );
return VOS_STATUS_E_FAILURE;
}
/* Non-FTM mode, WDA status for START must be INIT
@@ -392,7 +392,7 @@
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
"%s: Invoked from wrong state %d",
- __FUNCTION__, wdaContext->wdaState );
+ __func__, wdaContext->wdaState );
return VOS_STATUS_E_FAILURE;
}
/* initialize the wdiStartParam. Note that we can create this on
@@ -405,7 +405,7 @@
if ( !VOS_IS_STATUS_SUCCESS(status) )
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: Unable to prepare Config TLV", __FUNCTION__ );
+ "%s: Unable to prepare Config TLV", __func__ );
return VOS_STATUS_E_FAILURE;
}
/* note from here onwards if an error occurs we must
@@ -422,7 +422,7 @@
if ( IS_WDI_STATUS_FAILURE(wdiStatus) )
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_FATAL,
- "%s: WDI Start failed", __FUNCTION__ );
+ "%s: WDI Start failed", __func__ );
vos_mem_free(wdiStartParam.pConfigBuffer);
return VOS_STATUS_E_FAILURE;
}
@@ -434,13 +434,13 @@
if ( VOS_STATUS_E_TIMEOUT == status )
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: Timeout occurred during WDI_Start", __FUNCTION__ );
+ "%s: Timeout occurred during WDI_Start", __func__ );
}
else
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
"%s: Error %d while waiting for WDI_Start",
- __FUNCTION__, status);
+ __func__, status);
}
vos_mem_free(wdiStartParam.pConfigBuffer);
return VOS_STATUS_E_FAILURE;
@@ -452,7 +452,7 @@
if (WDA_START_STATE != wdaContext->wdaState)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: WDI_Start() failure detected", __FUNCTION__ );
+ "%s: WDI_Start() failure detected", __func__ );
return VOS_STATUS_E_FAILURE;
}
/* FTM mode does not need to monitor BA activity */
@@ -483,7 +483,7 @@
if ((NULL == pMac)||(NULL == wdaContext))
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: Invoked with invalid wdaContext or pMac", __FUNCTION__ );
+ "%s: Invoked with invalid wdaContext or pMac", __func__ );
VOS_ASSERT(0);
return VOS_STATUS_E_FAILURE;
}
@@ -500,7 +500,7 @@
if(NULL == configParam )
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s:configParam is NULL", __FUNCTION__);
+ "%s:configParam is NULL", __func__);
VOS_ASSERT(0) ;
return VOS_STATUS_E_NOMEM;
}
@@ -1427,7 +1427,7 @@
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: pWdaParams received NULL", __FUNCTION__);
+ "%s: pWdaParams received NULL", __func__);
VOS_ASSERT(0) ;
return ;
}
@@ -1437,7 +1437,7 @@
if (NULL == wdaContext)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: Invoked with invalid wdaContext", __FUNCTION__ );
+ "%s: Invoked with invalid wdaContext", __func__ );
return ;
}
@@ -1479,14 +1479,14 @@
if (NULL == pWDA)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: Invoked with invalid pWDA", __FUNCTION__ );
+ "%s: Invoked with invalid pWDA", __func__ );
VOS_ASSERT(0);
return VOS_STATUS_E_FAILURE;
}
if (pWDA->wdiFailed == true)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_FATAL,
- "%s: WDI in failed state", __FUNCTION__ );
+ "%s: WDI in failed state", __func__ );
return VOS_STATUS_E_ALREADY;
}
@@ -1502,7 +1502,7 @@
if(NULL == wdiStopReq)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
return VOS_STATUS_E_NOMEM;
}
@@ -1514,7 +1514,7 @@
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
vos_mem_free(wdiStopReq);
return VOS_STATUS_E_NOMEM;
@@ -1555,7 +1555,7 @@
if (NULL == wdaContext)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: Invoked with invalid wdaContext", __FUNCTION__ );
+ "%s: Invoked with invalid wdaContext", __func__ );
return VOS_STATUS_E_FAILURE;
}
if((WDA_INIT_STATE != wdaContext->wdaState) &&
@@ -1657,11 +1657,11 @@
{
tWDA_CbContext *pWDA;
VOS_TRACE(VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO_LOW,
- "%s: Entered", __FUNCTION__);
+ "%s: Entered", __func__);
if ((NULL == pvosGCtx) || (NULL == pVersion))
{
VOS_TRACE(VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: Invoked with invalid parameter", __FUNCTION__);
+ "%s: Invoked with invalid parameter", __func__);
VOS_ASSERT(0);
return VOS_STATUS_E_FAILURE;
}
@@ -1669,7 +1669,7 @@
if (NULL == pWDA )
{
VOS_TRACE(VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: Invalid WDA context", __FUNCTION__);
+ "%s: Invalid WDA context", __func__);
VOS_ASSERT(0);
return VOS_STATUS_E_FAILURE;
}
@@ -1686,11 +1686,11 @@
{
tWDA_CbContext *pWDA;
VOS_TRACE(VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO_LOW,
- "%s: Entered", __FUNCTION__);
+ "%s: Entered", __func__);
if ((NULL == pvosGCtx) || (NULL == pVersion))
{
VOS_TRACE(VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: Invoked with invalid parameter", __FUNCTION__);
+ "%s: Invoked with invalid parameter", __func__);
VOS_ASSERT(0);
return VOS_STATUS_E_FAILURE;
}
@@ -1698,7 +1698,7 @@
if (NULL == pWDA )
{
VOS_TRACE(VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: Invalid WDA context", __FUNCTION__);
+ "%s: Invalid WDA context", __func__);
VOS_ASSERT(0);
return VOS_STATUS_E_FAILURE;
}
@@ -1715,11 +1715,11 @@
{
tWDA_CbContext *pWDA;
VOS_TRACE(VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "%s: Entered", __FUNCTION__);
+ "%s: Entered", __func__);
if ((NULL == pvosGCtx) || (NULL == pVersion))
{
VOS_TRACE(VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: Invoked with invalid parameter", __FUNCTION__);
+ "%s: Invoked with invalid parameter", __func__);
VOS_ASSERT(0);
return VOS_STATUS_E_FAILURE;
}
@@ -1727,7 +1727,7 @@
if (NULL == pWDA )
{
VOS_TRACE(VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: Invalid WDA context", __FUNCTION__);
+ "%s: Invalid WDA context", __func__);
VOS_ASSERT(0);
return VOS_STATUS_E_FAILURE;
}
@@ -1744,11 +1744,11 @@
{
tWDA_CbContext *pWDA;
VOS_TRACE(VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "%s: Entered", __FUNCTION__);
+ "%s: Entered", __func__);
if ((NULL == pvosGCtx) || (NULL == pVersion))
{
VOS_TRACE(VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: Invoked with invalid parameter", __FUNCTION__);
+ "%s: Invoked with invalid parameter", __func__);
VOS_ASSERT(0);
return VOS_STATUS_E_FAILURE;
}
@@ -1756,7 +1756,7 @@
if (NULL == pWDA )
{
VOS_TRACE(VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: Invalid WDA context", __FUNCTION__);
+ "%s: Invalid WDA context", __func__);
VOS_ASSERT(0);
return VOS_STATUS_E_FAILURE;
}
@@ -1780,7 +1780,7 @@
if (NULL == pMac )
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: Invoked with invalid MAC context ", __FUNCTION__ );
+ "%s: Invoked with invalid MAC context ", __func__ );
VOS_ASSERT(0);
return VOS_STATUS_E_FAILURE;
}
@@ -1859,11 +1859,11 @@
{
tWDA_CbContext *pWDA = (tWDA_CbContext *)VOS_GET_WDA_CTXT(pvosGCtx);
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "%s: Entered " ,__FUNCTION__);
+ "%s: Entered " ,__func__);
if (NULL == pWDA )
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: Invoked with invalid WDA context ", __FUNCTION__ );
+ "%s: Invoked with invalid WDA context ", __func__ );
VOS_ASSERT(0);
return VOS_STATUS_E_FAILURE;
}
@@ -1905,7 +1905,7 @@
tANI_U8 ucSTAId = 0;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "%s: Entered " ,__FUNCTION__);
+ "%s: Entered " ,__func__);
pWDA->txStatus = WDA_TL_TX_SUSPEND_FAILURE;
if (pWDA->txSuspendTimedOut)
{
@@ -1938,7 +1938,7 @@
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
"%s: Status %d when waiting for Suspend Data TX Event",
- __FUNCTION__, status);
+ __func__, status);
/* Set this flag to true when TL suspend times out, so that when TL
* suspend eventually happens and calls the callback, TL can be resumed
* right away by looking at this flag when true.*/
@@ -1964,7 +1964,7 @@
tANI_U8 ucSTAId = 0;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "%s: Entered " ,__FUNCTION__);
+ "%s: Entered " ,__func__);
ucSTAId = WLAN_ALL_STA;
status = WLANTL_ResumeDataTx(pWDA->pVosContext, &ucSTAId);
return status;
@@ -1980,11 +1980,11 @@
tInitScanParams *pWDA_ScanParam ;
VOS_STATUS status;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "<------ %s " ,__FUNCTION__);
+ "<------ %s " ,__func__);
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: pWdaParams received NULL", __FUNCTION__);
+ "%s: pWdaParams received NULL", __func__);
VOS_ASSERT(0) ;
return ;
}
@@ -1993,7 +1993,7 @@
if(NULL == pWDA_ScanParam)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: pWDA_ScanParam received NULL", __FUNCTION__);
+ "%s: pWDA_ScanParam received NULL", __func__);
VOS_ASSERT(0);
vos_mem_free(pWdaParams->wdaWdiApiMsgParam);
vos_mem_free(pWdaParams);
@@ -2005,7 +2005,7 @@
if(VOS_STATUS_SUCCESS != status)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s error in Resume Tx ", __FUNCTION__ );
+ "%s error in Resume Tx ", __func__ );
}
}
/* free WDI command buffer */
@@ -2035,11 +2035,11 @@
tANI_U8 i = 0;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "------> %s " ,__FUNCTION__);
+ "------> %s " ,__func__);
if(NULL == wdiInitScanParam)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s:VOS MEM Alloc Failure", __FUNCTION__);
+ "%s:VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
return VOS_STATUS_E_NOMEM;
}
@@ -2047,7 +2047,7 @@
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
vos_mem_free(wdiInitScanParam);
return VOS_STATUS_E_NOMEM;
@@ -2129,11 +2129,11 @@
tWDA_CbContext *pWDA;
tStartScanParams *pWDA_ScanParam;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "<------ %s " ,__FUNCTION__);
+ "<------ %s " ,__func__);
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: pWdaParams received NULL", __FUNCTION__);
+ "%s: pWdaParams received NULL", __func__);
VOS_ASSERT(0) ;
return ;
}
@@ -2142,7 +2142,7 @@
if(NULL == pWDA_ScanParam)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: pWDA_ScanParam received NULL", __FUNCTION__);
+ "%s: pWDA_ScanParam received NULL", __func__);
VOS_ASSERT(0) ;
vos_mem_free(pWdaParams);
return ;
@@ -2150,7 +2150,7 @@
if(NULL == pWdaParams->wdaWdiApiMsgParam)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: wdaWdiApiMsgParam is NULL", __FUNCTION__);
+ "%s: wdaWdiApiMsgParam is NULL", __func__);
VOS_ASSERT(0) ;
vos_mem_free(pWdaParams);
return ;
@@ -2179,11 +2179,11 @@
sizeof(WDI_StartScanReqParamsType)) ;
tWDA_ReqParams *pWdaParams;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "------> %s " ,__FUNCTION__);
+ "------> %s " ,__func__);
if(NULL == wdiStartScanParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
return VOS_STATUS_E_NOMEM;
}
@@ -2191,7 +2191,7 @@
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
vos_mem_free(wdiStartScanParams);
return VOS_STATUS_E_NOMEM;
@@ -2231,11 +2231,11 @@
tWDA_CbContext *pWDA;
tEndScanParams *endScanParam;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "<------ %s " ,__FUNCTION__);
+ "<------ %s " ,__func__);
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: pWdaParams received NULL", __FUNCTION__);
+ "%s: pWdaParams received NULL", __func__);
VOS_ASSERT(0) ;
return ;
}
@@ -2244,7 +2244,7 @@
if(NULL == endScanParam)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: endScanParam received NULL", __FUNCTION__);
+ "%s: endScanParam received NULL", __func__);
VOS_ASSERT(0) ;
vos_mem_free(pWdaParams->wdaWdiApiMsgParam);
vos_mem_free(pWdaParams);
@@ -2274,11 +2274,11 @@
sizeof(WDI_EndScanReqParamsType)) ;
tWDA_ReqParams *pWdaParams ;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "------> %s " ,__FUNCTION__);
+ "------> %s " ,__func__);
if(NULL == wdiEndScanParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
return VOS_STATUS_E_NOMEM;
}
@@ -2286,7 +2286,7 @@
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
vos_mem_free(wdiEndScanParams);
return VOS_STATUS_E_NOMEM;
@@ -2325,11 +2325,11 @@
tFinishScanParams *finishScanParam;
VOS_STATUS status;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "<------ %s " ,__FUNCTION__);
+ "<------ %s " ,__func__);
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: pWdaParams received NULL", __FUNCTION__);
+ "%s: pWdaParams received NULL", __func__);
VOS_ASSERT(0) ;
return ;
}
@@ -2339,7 +2339,7 @@
if(NULL == finishScanParam)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: finishScanParam is NULL", __FUNCTION__);
+ "%s: finishScanParam is NULL", __func__);
VOS_ASSERT(0) ;
vos_mem_free(pWdaParams->wdaWdiApiMsgParam);
vos_mem_free(pWdaParams);
@@ -2356,7 +2356,7 @@
if(VOS_STATUS_SUCCESS != status)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s error in Resume Tx ", __FUNCTION__ );
+ "%s error in Resume Tx ", __func__ );
}
finishScanParam->status = CONVERT_WDI2SIR_STATUS(wdiStatus) ;
WDA_SendMsg(pWDA, WDA_FINISH_SCAN_RSP, (void *)finishScanParam, 0) ;
@@ -2376,11 +2376,11 @@
tWDA_ReqParams *pWdaParams ;
tANI_U8 i = 0;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "------> %s " ,__FUNCTION__);
+ "------> %s " ,__func__);
if(NULL == wdiFinishScanParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
return VOS_STATUS_E_NOMEM;
}
@@ -2388,7 +2388,7 @@
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
vos_mem_free(wdiFinishScanParams);
return VOS_STATUS_E_NOMEM;
@@ -2459,11 +2459,11 @@
tWDA_CbContext *pWDA;
tSwitchChannelParams *joinReqParam;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "<------ %s " ,__FUNCTION__);
+ "<------ %s " ,__func__);
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: pWdaParams received NULL", __FUNCTION__);
+ "%s: pWdaParams received NULL", __func__);
VOS_ASSERT(0) ;
return ;
}
@@ -2492,11 +2492,11 @@
sizeof(WDI_JoinReqParamsType)) ;
tWDA_ReqParams *pWdaParams ;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "------> %s " ,__FUNCTION__);
+ "------> %s " ,__func__);
if(NULL == wdiJoinReqParam)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
vos_mem_free(joinReqParam);
return VOS_STATUS_E_NOMEM;
@@ -2505,7 +2505,7 @@
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
vos_mem_free(wdiJoinReqParam);
vos_mem_free(joinReqParam);
@@ -2519,7 +2519,7 @@
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_FATAL,
"%s: received join request when BSSID or self-STA is NULL "
" BSSID:" WDA_MAC_ADDRESS_STR "Self-STA:" WDA_MAC_ADDRESS_STR,
- __FUNCTION__, WDA_MAC_ADDR_ARRAY(pWDA->macBSSID),
+ __func__, WDA_MAC_ADDR_ARRAY(pWDA->macBSSID),
WDA_MAC_ADDR_ARRAY(pWDA->macSTASelf));
VOS_ASSERT(0);
vos_mem_free(wdiJoinReqParam);
@@ -2577,11 +2577,11 @@
tWDA_CbContext *pWDA;
tSwitchChannelParams *pSwitchChanParams;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "<------ %s " ,__FUNCTION__);
+ "<------ %s " ,__func__);
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: pWdaParams received NULL", __FUNCTION__);
+ "%s: pWdaParams received NULL", __func__);
VOS_ASSERT(0) ;
return ;
}
@@ -2611,11 +2611,11 @@
sizeof(WDI_SwitchChReqParamsType)) ;
tWDA_ReqParams *pWdaParams ;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "------> %s " ,__FUNCTION__);
+ "------> %s " ,__func__);
if(NULL == wdiSwitchChanParam)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
return VOS_STATUS_E_NOMEM;
}
@@ -2623,7 +2623,7 @@
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
vos_mem_free(wdiSwitchChanParam);
return VOS_STATUS_E_NOMEM;
@@ -2677,11 +2677,11 @@
tAddBssParams *configBssReqParam;
tAddStaParams *staConfigBssParam;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "<------ %s " ,__FUNCTION__);
+ "<------ %s " ,__func__);
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: pWdaParams received NULL", __FUNCTION__);
+ "%s: pWdaParams received NULL", __func__);
VOS_ASSERT(0) ;
return ;
}
@@ -2767,13 +2767,13 @@
wdiConfigBssRsp->ucSTAIdx))
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: fail to set STA idx associated with BSS index", __FUNCTION__);
+ "%s: fail to set STA idx associated with BSS index", __func__);
VOS_ASSERT(0) ;
}
if(WDI_DS_AddSTAMemPool(pWDA->pWdiContext, wdiConfigBssRsp->ucSTAIdx))
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: add BSS into mempool fail", __FUNCTION__);
+ "%s: add BSS into mempool fail", __func__);
VOS_ASSERT(0) ;
}
#ifdef WLAN_FEATURE_VOWIFI
@@ -2813,11 +2813,11 @@
sizeof(WDI_ConfigBSSReqParamsType)) ;
tWDA_ReqParams *pWdaParams ;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "------> %s " ,__FUNCTION__);
+ "------> %s " ,__func__);
if(NULL == wdiConfigBssReqParam)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
return VOS_STATUS_E_NOMEM;
}
@@ -2825,7 +2825,7 @@
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
vos_mem_free(wdiConfigBssReqParam);
return VOS_STATUS_E_NOMEM;
@@ -2869,7 +2869,7 @@
tAddStaParams *selfStaPostAssocParam =
&postAssocReqParam->addStaParams ;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "<------ %s " ,__FUNCTION__);
+ "<------ %s " ,__func__);
postAssocReqParam->status =
CONVERT_WDI2SIR_STATUS(wdiPostAssocRsp->wdiStatus) ;
if(WDI_STATUS_SUCCESS == wdiPostAssocRsp->wdiStatus)
@@ -2901,12 +2901,12 @@
(WDI_PostAssocReqParamsType *)vos_mem_malloc(
sizeof(WDI_PostAssocReqParamsType)) ;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "------> %s " ,__FUNCTION__);
+ "------> %s " ,__func__);
if(NULL == wdiPostAssocReqParam)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
return VOS_STATUS_E_NOMEM;
}
@@ -2914,7 +2914,7 @@
if((NULL != pWDA->wdaMsgParam) || (NULL != pWDA->wdaWdiApiMsgParam))
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: wdaMsgParam or wdaWdiApiMsgParam is not NULL", __FUNCTION__);
+ "%s: wdaMsgParam or wdaWdiApiMsgParam is not NULL", __func__);
VOS_ASSERT(0);
return VOS_STATUS_E_FAILURE;
}
@@ -2970,10 +2970,10 @@
tWDA_CbContext *pWDA;
tAddStaParams *addStaReqParam;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "<------ %s " ,__FUNCTION__);
+ "<------ %s " ,__func__);
if(NULL == pWdaParams)
{
- VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,"%s: pWdaParams is NULL", __FUNCTION__);
+ VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,"%s: pWdaParams is NULL", __func__);
VOS_ASSERT(0) ;
return ;
}
@@ -3001,7 +3001,7 @@
if(WDI_DS_AddSTAMemPool(pWDA->pWdiContext, wdiConfigStaRsp->ucSTAIdx))
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: add STA into mempool fail", __FUNCTION__);
+ "%s: add STA into mempool fail", __func__);
VOS_ASSERT(0) ;
return ;
}
@@ -3024,11 +3024,11 @@
sizeof(WDI_ConfigSTAReqParamsType)) ;
tWDA_ReqParams *pWdaParams ;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "------> %s " ,__FUNCTION__);
+ "------> %s " ,__func__);
if(NULL == wdiConfigStaReqParam)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
return VOS_STATUS_E_NOMEM;
}
@@ -3036,7 +3036,7 @@
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
vos_mem_free(wdiConfigStaReqParam);
return VOS_STATUS_E_NOMEM;
@@ -3075,11 +3075,11 @@
tDeleteBssParams *delBssReqParam;
tANI_U8 staIdx,tid;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "<------ %s " ,__FUNCTION__);
+ "<------ %s " ,__func__);
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: pWdaParams received NULL", __FUNCTION__);
+ "%s: pWdaParams received NULL", __func__);
VOS_ASSERT(0) ;
return ;
}
@@ -3094,19 +3094,19 @@
if(WDI_DS_GetStaIdxFromBssIdx(pWDA->pWdiContext, delBssReqParam->bssIdx, &staIdx))
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: Get STA index from BSS index Fail", __FUNCTION__);
+ "%s: Get STA index from BSS index Fail", __func__);
VOS_ASSERT(0) ;
}
if(WDI_DS_DelSTAMemPool(pWDA->pWdiContext, staIdx))
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: DEL STA from MemPool Fail", __FUNCTION__);
+ "%s: DEL STA from MemPool Fail", __func__);
VOS_ASSERT(0) ;
}
if(WDI_DS_ClearStaIdxPerBssIdx(pWDA->pWdiContext, delBssReqParam->bssIdx, staIdx))
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: Clear STA index form table Fail", __FUNCTION__);
+ "%s: Clear STA index form table Fail", __func__);
VOS_ASSERT(0) ;
}
vos_mem_free(pWdaParams->wdaWdiApiMsgParam);
@@ -3145,11 +3145,11 @@
sizeof(WDI_DelBSSReqParamsType)) ;
tWDA_ReqParams *pWdaParams ;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "------> %s " ,__FUNCTION__);
+ "------> %s " ,__func__);
if(NULL == wdiDelBssReqParam)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
return VOS_STATUS_E_NOMEM;
}
@@ -3157,7 +3157,7 @@
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
vos_mem_free(wdiDelBssReqParam);
return VOS_STATUS_E_NOMEM;
@@ -3194,11 +3194,11 @@
tWDA_CbContext *pWDA;
tDeleteStaParams *delStaReqParam;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "<------ %s " ,__FUNCTION__);
+ "<------ %s " ,__func__);
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: pWdaParams received NULL", __FUNCTION__);
+ "%s: pWdaParams received NULL", __func__);
VOS_ASSERT(0) ;
return ;
}
@@ -3210,7 +3210,7 @@
if(WDI_DS_DelSTAMemPool(pWDA->pWdiContext, wdiDelStaRsp->ucSTAIdx))
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: DEL STA from MemPool Fail", __FUNCTION__);
+ "%s: DEL STA from MemPool Fail", __func__);
VOS_ASSERT(0) ;
}
delStaReqParam->staIdx = wdiDelStaRsp->ucSTAIdx ;
@@ -3238,11 +3238,11 @@
sizeof(WDI_DelSTAReqParamsType)) ;
tWDA_ReqParams *pWdaParams ;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "------> %s " ,__FUNCTION__);
+ "------> %s " ,__func__);
if(NULL == wdiDelStaReqParam)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
return VOS_STATUS_E_NOMEM;
}
@@ -3250,7 +3250,7 @@
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
vos_mem_free(wdiDelStaReqParam);
return VOS_STATUS_E_NOMEM;
@@ -3282,11 +3282,11 @@
tWDA_CbContext *pWDA;
tAddStaSelfParams *pAddStaSelfRsp = NULL;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "<------ %s " ,__FUNCTION__);
+ "<------ %s " ,__func__);
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: pWdaParams received NULL", __FUNCTION__);
+ "%s: pWdaParams received NULL", __func__);
VOS_ASSERT(0) ;
return ;
}
@@ -3314,12 +3314,12 @@
sizeof(WDI_AddSTASelfReqParamsType)) ;
tWDA_ReqParams *pWdaParams;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "------> %s " ,__FUNCTION__);
+ "------> %s " ,__func__);
if( NULL == wdiAddStaSelfReq )
{
VOS_ASSERT( 0 );
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: Unable to allocate memory " ,__FUNCTION__);
+ "%s: Unable to allocate memory " ,__func__);
return( VOS_STATUS_E_NOMEM );
}
pWdaParams = (tWDA_ReqParams *)vos_mem_malloc(sizeof(tWDA_ReqParams)) ;
@@ -3327,7 +3327,7 @@
{
VOS_ASSERT( 0 );
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: Unable to allocate memory " ,__FUNCTION__);
+ "%s: Unable to allocate memory " ,__func__);
vos_mem_free(wdiAddStaSelfReq) ;
return( VOS_STATUS_E_NOMEM );
}
@@ -3364,11 +3364,11 @@
tWDA_CbContext *pWDA;
tDelStaSelfParams *delStaSelfParams;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "<------ %s " ,__FUNCTION__);
+ "<------ %s " ,__func__);
if (NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: Invalid pWdaParams pointer", __FUNCTION__);
+ "%s: Invalid pWdaParams pointer", __func__);
VOS_ASSERT(0);
return;
}
@@ -3396,12 +3396,12 @@
VOS_TRACE(VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
"<------ %s, wdiStatus: %d pWdaParams: 0x%x",
- __FUNCTION__, wdiStatus, pWdaParams);
+ __func__, wdiStatus, pWdaParams);
if (NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: Invalid pWdaParams pointer", __FUNCTION__);
+ "%s: Invalid pWdaParams pointer", __func__);
VOS_ASSERT(0);
return;
}
@@ -3437,12 +3437,12 @@
sizeof(WDI_DelSTASelfReqParamsType)) ;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "------> %s " ,__FUNCTION__);
+ "------> %s " ,__func__);
if( NULL == wdiDelStaSelfReq )
{
VOS_ASSERT( 0 );
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: Unable to allocate memory " ,__FUNCTION__);
+ "%s: Unable to allocate memory " ,__func__);
return( VOS_STATUS_E_NOMEM );
}
@@ -3451,7 +3451,7 @@
{
VOS_ASSERT( 0 );
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: Unable to allocate memory " ,__FUNCTION__);
+ "%s: Unable to allocate memory " ,__func__);
vos_mem_free(wdiDelStaSelfReq) ;
return( VOS_STATUS_E_NOMEM );
}
@@ -3504,7 +3504,7 @@
vos_mem_free(pBodyptr);
}
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: limPostMsgApi is failed " ,__FUNCTION__);
+ "%s: limPostMsgApi is failed " ,__func__);
VOS_ASSERT(0) ;
}
return ;
@@ -3855,7 +3855,7 @@
WDI_UpdateCfgReqParamsType *wdiCfgParam =
(WDI_UpdateCfgReqParamsType *)pWDA->wdaWdiCfgApiMsgParam ;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "<------ %s " ,__FUNCTION__);
+ "<------ %s " ,__func__);
/*
* currently there is no response message is expected between PE and
* WDA, Failure return from WDI is a ASSERT condition
@@ -3863,7 +3863,7 @@
if(WDI_STATUS_SUCCESS != wdiStatus)
{
VOS_TRACE(VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: CFG (%d) config failure \n", __FUNCTION__,
+ "%s: CFG (%d) config failure \n", __func__,
((tHalCfg *)(wdiCfgParam->pConfigBuffer))->type);
}
@@ -3886,11 +3886,11 @@
WDI_UpdateCfgReqParamsType *wdiCfgReqParam = NULL ;
tANI_U8 *configDataValue;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "------> %s " ,__FUNCTION__);
+ "------> %s " ,__func__);
if (NULL == pMac )
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: Invoked with invalid MAC context ", __FUNCTION__ );
+ "%s: Invoked with invalid MAC context ", __func__ );
return VOS_STATUS_E_FAILURE;
}
if(WDA_START_STATE != pWDA->wdaState)
@@ -3901,7 +3901,7 @@
if(NULL != pWDA->wdaWdiCfgApiMsgParam)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s:wdaWdiCfgApiMsgParam is not NULL", __FUNCTION__);
+ "%s:wdaWdiCfgApiMsgParam is not NULL", __func__);
VOS_ASSERT(0);
return VOS_STATUS_E_FAILURE;
}
@@ -3911,7 +3911,7 @@
if(NULL == wdiCfgReqParam)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
return VOS_STATUS_E_NOMEM;
}
@@ -3920,7 +3920,7 @@
if(NULL == wdiCfgReqParam->pConfigBuffer)
{
VOS_TRACE(VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure \n", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure \n", __func__);
vos_mem_free(wdiCfgReqParam);
VOS_ASSERT(0);
return VOS_STATUS_E_NOMEM;
@@ -3981,7 +3981,7 @@
if (NULL == pMac )
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: Invoked with invalid MAC context ", __FUNCTION__ );
+ "%s: Invoked with invalid MAC context ", __func__ );
return VOS_STATUS_E_FAILURE;
}
if( eSIR_SUCCESS != wlan_cfgGetInt( pMac, WNI_CFG_WEP_DEFAULT_KEYID,
@@ -4036,11 +4036,11 @@
tWDA_CbContext *pWDA;
tSetBssKeyParams *setBssKeyParams;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "<------ %s " ,__FUNCTION__);
+ "<------ %s " ,__func__);
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: pWdaParams received NULL", __FUNCTION__);
+ "%s: pWdaParams received NULL", __func__);
VOS_ASSERT(0) ;
return ;
}
@@ -4067,11 +4067,11 @@
tWDA_ReqParams *pWdaParams ;
v_U8_t keyIndex;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "------> %s " ,__FUNCTION__);
+ "------> %s " ,__func__);
if(NULL == wdiSetBssKeyParam)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
return VOS_STATUS_E_NOMEM;
}
@@ -4079,7 +4079,7 @@
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
vos_mem_free(wdiSetBssKeyParam);
return VOS_STATUS_E_NOMEM;
@@ -4154,11 +4154,11 @@
tWDA_CbContext *pWDA;
tRemoveBssKeyParams *removeBssKeyParams;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "<------ %s " ,__FUNCTION__);
+ "<------ %s " ,__func__);
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: pWdaParams received NULL", __FUNCTION__);
+ "%s: pWdaParams received NULL", __func__);
VOS_ASSERT(0) ;
return ;
}
@@ -4185,11 +4185,11 @@
sizeof(WDI_RemoveBSSKeyReqParamsType)) ;
tWDA_ReqParams *pWdaParams ;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "------> %s " ,__FUNCTION__);
+ "------> %s " ,__func__);
if(NULL == wdiRemoveBssKeyParam)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
return VOS_STATUS_E_NOMEM;
}
@@ -4197,7 +4197,7 @@
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
vos_mem_free(wdiRemoveBssKeyParam);
return VOS_STATUS_E_NOMEM;
@@ -4236,11 +4236,11 @@
tWDA_CbContext *pWDA;
tSetStaKeyParams *setStaKeyParams;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "<------ %s " ,__FUNCTION__);
+ "<------ %s " ,__func__);
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR
- ,"%s: pWdaParams received NULL", __FUNCTION__);
+ ,"%s: pWdaParams received NULL", __func__);
VOS_ASSERT(0) ;
return ;
}
@@ -4267,11 +4267,11 @@
tWDA_ReqParams *pWdaParams ;
v_U8_t keyIndex;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "------> %s " ,__FUNCTION__);
+ "------> %s " ,__func__);
if(NULL == wdiSetStaKeyParam)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
return VOS_STATUS_E_NOMEM;
}
@@ -4279,7 +4279,7 @@
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
vos_mem_free(wdiSetStaKeyParam);
return VOS_STATUS_E_NOMEM;
@@ -4380,11 +4380,11 @@
tWDA_CbContext *pWDA;
tSetStaKeyParams *setStaKeyParams;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "<------ %s " ,__FUNCTION__);
+ "<------ %s " ,__func__);
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: pWdaParams received NULL", __FUNCTION__);
+ "%s: pWdaParams received NULL", __func__);
VOS_ASSERT(0) ;
return ;
}
@@ -4412,11 +4412,11 @@
tWDA_ReqParams *pWdaParams ;
v_U8_t keyIndex;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "------> %s " ,__FUNCTION__);
+ "------> %s " ,__func__);
if(NULL == wdiSetStaKeyParam)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
return VOS_STATUS_E_NOMEM;
}
@@ -4424,7 +4424,7 @@
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
vos_mem_free(wdiSetStaKeyParam);
return VOS_STATUS_E_NOMEM;
@@ -4507,11 +4507,11 @@
tWDA_CbContext *pWDA;
tRemoveStaKeyParams *removeStaKeyParams;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "<------ %s " ,__FUNCTION__);
+ "<------ %s " ,__func__);
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: pWdaParams received NULL", __FUNCTION__);
+ "%s: pWdaParams received NULL", __func__);
VOS_ASSERT(0) ;
return ;
}
@@ -4537,11 +4537,11 @@
sizeof(WDI_RemoveSTAKeyReqParamsType)) ;
tWDA_ReqParams *pWdaParams ;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "------> %s " ,__FUNCTION__);
+ "------> %s " ,__func__);
if(NULL == wdiRemoveStaKeyParam)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
return VOS_STATUS_E_NOMEM;
}
@@ -4549,7 +4549,7 @@
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
vos_mem_free(wdiRemoveStaKeyParam);
return VOS_STATUS_E_NOMEM;
@@ -4604,7 +4604,7 @@
else
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_FATAL,
- "%s: BSSID in set link state is NULL ", __FUNCTION__);
+ "%s: BSSID in set link state is NULL ", __func__);
VOS_ASSERT(0);
}
@@ -4616,7 +4616,7 @@
else
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_FATAL,
- "%s: self mac address in set link state is NULL ", __FUNCTION__);
+ "%s: self mac address in set link state is NULL ", __func__);
VOS_ASSERT(0);
}
@@ -4672,11 +4672,11 @@
tLinkStateParams *linkStateParams;
tWDA_ReqParams *pWdaParams = (tWDA_ReqParams *)pUserData;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "<------ %s " ,__FUNCTION__);
+ "<------ %s " ,__func__);
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: pWdaParams received NULL", __FUNCTION__);
+ "%s: pWdaParams received NULL", __func__);
VOS_ASSERT(0) ;
return ;
}
@@ -4724,18 +4724,18 @@
if(NULL == pMac)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s:pMac is NULL", __FUNCTION__);
+ "%s:pMac is NULL", __func__);
VOS_ASSERT(0);
vos_mem_free(wdiSetLinkStateParam);
return VOS_STATUS_E_FAILURE;
}
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "------> %s " ,__FUNCTION__);
+ "------> %s " ,__func__);
if(NULL == wdiSetLinkStateParam)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
return VOS_STATUS_E_NOMEM;
}
@@ -4743,7 +4743,7 @@
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
vos_mem_free(wdiSetLinkStateParam);
return VOS_STATUS_E_NOMEM;
@@ -4801,7 +4801,7 @@
tAniGetPEStatsRsp *pGetPEStatsRspParams;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "<------ %s " ,__FUNCTION__);
+ "<------ %s " ,__func__);
pGetPEStatsRspParams =
(tAniGetPEStatsRsp *)vos_mem_malloc(sizeof(tAniGetPEStatsRsp) +
(wdiGetStatsRsp->usMsgLen - sizeof(WDI_GetStatsRspParamsType)));
@@ -4809,7 +4809,7 @@
if(NULL == pGetPEStatsRspParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
return;
}
@@ -4845,7 +4845,7 @@
WDI_GetStatsReqParamsType wdiGetStatsParam;
tAniGetPEStatsRsp *pGetPEStatsRspParams;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "------> %s " ,__FUNCTION__);
+ "------> %s " ,__func__);
wdiGetStatsParam.wdiGetStatsParamsInfo.ucSTAIdx =
pGetStatsParams->staId;
wdiGetStatsParam.wdiGetStatsParamsInfo.uStatsMask =
@@ -4862,7 +4862,7 @@
if(NULL == pGetPEStatsRspParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
vos_mem_free(pGetStatsParams);
return VOS_STATUS_E_NOMEM;
@@ -4888,11 +4888,11 @@
tEdcaParams *pEdcaParams;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "<------ %s " ,__FUNCTION__);
+ "<------ %s " ,__func__);
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: pWdaParams received NULL", __FUNCTION__);
+ "%s: pWdaParams received NULL", __func__);
VOS_ASSERT(0) ;
return ;
}
@@ -4915,11 +4915,11 @@
sizeof(WDI_UpdateEDCAParamsType)) ;
tWDA_ReqParams *pWdaParams ;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "------> %s " ,__FUNCTION__);
+ "------> %s " ,__func__);
if(NULL == wdiEdcaParam)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
vos_mem_free(pEdcaParams);
return VOS_STATUS_E_NOMEM;
@@ -4928,7 +4928,7 @@
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
vos_mem_free(wdiEdcaParam);
vos_mem_free(pEdcaParams);
@@ -4973,11 +4973,11 @@
tWDA_CbContext *pWDA;
tAddBAParams *pAddBAReqParams;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "<------ %s " ,__FUNCTION__);
+ "<------ %s " ,__func__);
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: pWdaParams received NULL", __FUNCTION__);
+ "%s: pWdaParams received NULL", __func__);
VOS_ASSERT(0) ;
return ;
}
@@ -5003,11 +5003,11 @@
sizeof(WDI_AddBAReqParamsType)) ;
tWDA_ReqParams *pWdaParams ;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "------> %s " ,__FUNCTION__);
+ "------> %s " ,__func__);
if(NULL == wdiAddBAReqParam)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
return VOS_STATUS_E_NOMEM;
}
@@ -5015,7 +5015,7 @@
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
vos_mem_free(wdiAddBAReqParam);
return VOS_STATUS_E_NOMEM;
@@ -5059,11 +5059,11 @@
tWDA_CbContext *pWDA;
tAddBAParams *pAddBAReqParams ;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "<------ %s " ,__FUNCTION__);
+ "<------ %s " ,__func__);
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: pWdaParams received NULL", __FUNCTION__);
+ "%s: pWdaParams received NULL", __func__);
VOS_ASSERT(0) ;
return ;
}
@@ -5072,7 +5072,7 @@
if( NULL == pAddBAReqParams )
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: pAddBAReqParams received NULL " ,__FUNCTION__);
+ "%s: pAddBAReqParams received NULL " ,__func__);
VOS_ASSERT( 0 );
vos_mem_free(pWdaParams->wdaWdiApiMsgParam) ;
vos_mem_free(pWdaParams);
@@ -5132,11 +5132,11 @@
sizeof(WDI_AddBASessionReqParamsType)) ;
tWDA_ReqParams *pWdaParams ;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "------> %s " ,__FUNCTION__);
+ "------> %s " ,__func__);
if(NULL == wdiAddBASessionReqParam)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
return VOS_STATUS_E_NOMEM;
}
@@ -5144,7 +5144,7 @@
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
vos_mem_free(wdiAddBASessionReqParam);
return VOS_STATUS_E_NOMEM;
@@ -5208,7 +5208,7 @@
if(NULL == pDelBAInd)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0) ;
return;
}
@@ -5236,11 +5236,11 @@
tWDA_CbContext *pWDA;
tDelBAParams *pDelBAReqParams;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "<------ %s " ,__FUNCTION__);
+ "<------ %s " ,__func__);
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: pWdaParams received NULL", __FUNCTION__);
+ "%s: pWdaParams received NULL", __func__);
VOS_ASSERT(0) ;
return ;
}
@@ -5277,11 +5277,11 @@
tANI_U16 staIdx = 0;
tANI_U8 tid = 0;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "------> %s " ,__FUNCTION__);
+ "------> %s " ,__func__);
if(NULL == wdiDelBAReqParam)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
return VOS_STATUS_E_NOMEM;
}
@@ -5289,7 +5289,7 @@
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
vos_mem_free(wdiDelBAReqParam);
return VOS_STATUS_E_NOMEM;
@@ -5332,11 +5332,11 @@
tAddTsParams *pAddTsReqParams;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "<------ %s " ,__FUNCTION__);
+ "<------ %s " ,__func__);
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: pWdaParams received NULL", __FUNCTION__);
+ "%s: pWdaParams received NULL", __func__);
VOS_ASSERT(0) ;
return ;
}
@@ -5363,11 +5363,11 @@
sizeof(WDI_AddTSReqParamsType)) ;
tWDA_ReqParams *pWdaParams ;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "------> %s " ,__FUNCTION__);
+ "------> %s " ,__func__);
if(NULL == wdiAddTSReqParam)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
return VOS_STATUS_E_NOMEM;
}
@@ -5375,7 +5375,7 @@
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
vos_mem_free(wdiAddTSReqParam);
return VOS_STATUS_E_NOMEM;
@@ -5477,7 +5477,7 @@
{
tWDA_ReqParams *pWdaParams = (tWDA_ReqParams *)pUserData;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "<------ %s " ,__FUNCTION__);
+ "<------ %s " ,__func__);
vos_mem_free(pWdaParams->wdaWdiApiMsgParam) ;
vos_mem_free(pWdaParams->wdaMsgParam) ;
vos_mem_free(pWdaParams);
@@ -5501,11 +5501,11 @@
sizeof(WDI_DelTSReqParamsType)) ;
tWDA_ReqParams *pWdaParams ;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "------> %s " ,__FUNCTION__);
+ "------> %s " ,__func__);
if(NULL == wdiDelTSReqParam)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
return VOS_STATUS_E_NOMEM;
}
@@ -5513,7 +5513,7 @@
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
vos_mem_free(wdiDelTSReqParam);
return VOS_STATUS_E_NOMEM;
@@ -5548,11 +5548,11 @@
{
tWDA_ReqParams *pWdaParams = (tWDA_ReqParams *)pUserData;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "<------ %s " ,__FUNCTION__);
+ "<------ %s " ,__func__);
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: pWdaParams received NULL", __FUNCTION__);
+ "%s: pWdaParams received NULL", __func__);
VOS_ASSERT(0) ;
return ;
}
@@ -5578,11 +5578,11 @@
sizeof(WDI_UpdateBeaconParamsType)) ;
tWDA_ReqParams *pWdaParams ;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "------> %s " ,__FUNCTION__);
+ "------> %s " ,__func__);
if(NULL == wdiUpdateBeaconParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
return VOS_STATUS_E_NOMEM;
}
@@ -5590,7 +5590,7 @@
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
vos_mem_free(wdiUpdateBeaconParams);
return VOS_STATUS_E_NOMEM;
@@ -5651,11 +5651,11 @@
tTSMStats *pTsmRspParams = NULL;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "<------ Entering: %s " ,__FUNCTION__);
+ "<------ Entering: %s " ,__func__);
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: pWdaParams received NULL", __FUNCTION__);
+ "%s: pWdaParams received NULL", __func__);
VOS_ASSERT(0) ;
return ;
}
@@ -5664,7 +5664,7 @@
if( NULL == pTsmRspParams )
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: pTsmRspParams received NULL " ,__FUNCTION__);
+ "%s: pTsmRspParams received NULL " ,__func__);
VOS_ASSERT( 0 );
return ;
}
@@ -5697,11 +5697,11 @@
WDI_TSMStatsReqParamsType *wdiTSMReqParam = NULL;
tWDA_ReqParams *pWdaParams = NULL;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "------> Entering: %s " ,__FUNCTION__);
+ "------> Entering: %s " ,__func__);
if((NULL != pWDA->wdaMsgParam) || (NULL != pWDA->wdaWdiApiMsgParam))
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: wdaMsgParam or wdaWdiApiMsgParam is not NULL", __FUNCTION__);
+ "%s: wdaMsgParam or wdaWdiApiMsgParam is not NULL", __func__);
VOS_ASSERT(0);
return VOS_STATUS_E_FAILURE;
}
@@ -5710,7 +5710,7 @@
if(NULL == wdiTSMReqParam)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
return VOS_STATUS_E_NOMEM;
}
@@ -5718,7 +5718,7 @@
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
vos_mem_free(wdiTSMReqParam);
return VOS_STATUS_E_NOMEM;
@@ -5754,7 +5754,7 @@
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "<------ %s " ,__FUNCTION__);
+ "<------ %s " ,__func__);
return ;
}
/*
@@ -5768,7 +5768,7 @@
WDI_Status status = WDI_STATUS_SUCCESS ;
WDI_SendBeaconParamsType wdiSendBeaconReqParam;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "------> %s " ,__FUNCTION__);
+ "------> %s " ,__func__);
vos_mem_copy(wdiSendBeaconReqParam.wdiSendBeaconParamsInfo.macBSSID,
pSendbeaconParams->bssId, sizeof(tSirMacAddr));
wdiSendBeaconReqParam.wdiSendBeaconParamsInfo.beaconLength =
@@ -5803,7 +5803,7 @@
void WDA_UpdateProbeRspParamsCallback(WDI_Status status, void* pUserData)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "<------ %s " ,__FUNCTION__);
+ "<------ %s " ,__func__);
return ;
}
@@ -5819,7 +5819,7 @@
WDI_UpdateProbeRspTemplateParamsType *wdiSendProbeRspParam =
vos_mem_malloc(sizeof(WDI_UpdateProbeRspTemplateParamsType));
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "------> %s " ,__FUNCTION__);
+ "------> %s " ,__func__);
if (!wdiSendProbeRspParam)
return CONVERT_WDI2VOS_STATUS(WDI_STATUS_MEM_FAILURE);
@@ -5865,11 +5865,11 @@
tMaxTxPowerParams *pMaxTxPowerParams = NULL;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "<------ %s " ,__FUNCTION__);
+ "<------ %s " ,__func__);
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: pWdaParams received NULL", __FUNCTION__);
+ "%s: pWdaParams received NULL", __func__);
VOS_ASSERT(0) ;
return ;
}
@@ -5878,7 +5878,7 @@
if( NULL == pMaxTxPowerParams )
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: pMaxTxPowerParams received NULL " ,__FUNCTION__);
+ "%s: pMaxTxPowerParams received NULL " ,__func__);
VOS_ASSERT(0);
vos_mem_free(pWdaParams->wdaWdiApiMsgParam);
vos_mem_free(pWdaParams);
@@ -5910,14 +5910,14 @@
tWDA_ReqParams *pWdaParams = NULL;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "------> %s " ,__FUNCTION__);
+ "------> %s " ,__func__);
wdiSetMaxTxPowerParams = (WDI_SetMaxTxPowerParamsType *)vos_mem_malloc(
sizeof(WDI_SetMaxTxPowerParamsType));
if(NULL == wdiSetMaxTxPowerParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
return VOS_STATUS_E_NOMEM;
}
@@ -5925,7 +5925,7 @@
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
vos_mem_free(wdiSetMaxTxPowerParams);
VOS_ASSERT(0);
return VOS_STATUS_E_NOMEM;
@@ -5969,12 +5969,12 @@
tWDA_ReqParams *pWdaParams = (tWDA_ReqParams *)pUserData ;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "<------ %s " ,__FUNCTION__);
+ "<------ %s " ,__func__);
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: pWdaParams received NULL", __FUNCTION__);
+ "%s: pWdaParams received NULL", __func__);
VOS_ASSERT(0) ;
return ;
}
@@ -6004,11 +6004,11 @@
tWDA_ReqParams *pWdaParams = NULL;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "------> %s " ,__FUNCTION__);
+ "------> %s " ,__func__);
if(NULL == wdiSetP2PGONOAReqParam)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
return VOS_STATUS_E_NOMEM;
}
@@ -6017,7 +6017,7 @@
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
vos_mem_free(pP2pPsConfigParams);
vos_mem_free(wdiSetP2PGONOAReqParam);
VOS_ASSERT(0);
@@ -6074,11 +6074,11 @@
tAggrAddTsParams *pAggrAddTsReqParams;
int i;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "<------ %s " ,__FUNCTION__);
+ "<------ %s " ,__func__);
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: pWdaParams received NULL", __FUNCTION__);
+ "%s: pWdaParams received NULL", __func__);
VOS_ASSERT(0) ;
return ;
}
@@ -6110,13 +6110,13 @@
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "------> %s " ,__FUNCTION__);
+ "------> %s " ,__func__);
wdiAggrAddTSReqParam = (WDI_AggrAddTSReqParamsType *)vos_mem_malloc(
sizeof(WDI_AggrAddTSReqParamsType)) ;
if(NULL == wdiAggrAddTSReqParam)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
return VOS_STATUS_E_NOMEM;
}
@@ -6126,7 +6126,7 @@
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
vos_mem_free(pAggrAddTsReqParams);
vos_mem_free(wdiAggrAddTSReqParam);
VOS_ASSERT(0);
@@ -6236,7 +6236,7 @@
{
tWDA_CbContext *pWDA = (tWDA_CbContext *)pUserData ;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "<------ %s " ,__FUNCTION__);
+ "<------ %s " ,__func__);
WDA_SendMsg(pWDA, WDA_ENTER_IMPS_RSP, NULL , CONVERT_WDI2SIR_STATUS(status)) ;
return ;
}
@@ -6248,7 +6248,7 @@
{
WDI_Status status = WDI_STATUS_SUCCESS ;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "------> %s " ,__FUNCTION__);
+ "------> %s " ,__func__);
status = WDI_EnterImpsReq((WDI_EnterImpsRspCb)WDA_EnterImpsReqCallback, pWDA);
if(IS_WDI_STATUS_FAILURE(status))
{
@@ -6266,7 +6266,7 @@
{
tWDA_CbContext *pWDA = (tWDA_CbContext *)pUserData ;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "<------ %s " ,__FUNCTION__);
+ "<------ %s " ,__func__);
WDA_SendMsg(pWDA, WDA_EXIT_IMPS_RSP, NULL , CONVERT_WDI2SIR_STATUS(status)) ;
return ;
}
@@ -6278,7 +6278,7 @@
{
WDI_Status status = WDI_STATUS_SUCCESS ;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "------> %s " ,__FUNCTION__);
+ "------> %s " ,__func__);
status = WDI_ExitImpsReq((WDI_ExitImpsRspCb)WDA_ExitImpsReqCallback, pWDA);
if(IS_WDI_STATUS_FAILURE(status))
{
@@ -6299,11 +6299,11 @@
tEnterBmpsParams *pEnterBmpsRspParams;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "<------ %s " ,__FUNCTION__);
+ "<------ %s " ,__func__);
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: pWdaParams received NULL", __FUNCTION__);
+ "%s: pWdaParams received NULL", __func__);
VOS_ASSERT(0) ;
return ;
}
@@ -6331,11 +6331,11 @@
WDI_EnterBmpsReqParamsType *wdiEnterBmpsReqParams;
tWDA_ReqParams *pWdaParams;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "------> %s " ,__FUNCTION__);
+ "------> %s " ,__func__);
if ((NULL == pWDA) || (NULL == pEnterBmpsReqParams))
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: invalid param", __FUNCTION__);
+ "%s: invalid param", __func__);
VOS_ASSERT(0);
return VOS_STATUS_E_FAILURE;
}
@@ -6343,7 +6343,7 @@
if (NULL == wdiEnterBmpsReqParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
WDA_SendMsg(pWDA, WDA_ENTER_BMPS_RSP, NULL ,
CONVERT_WDI2SIR_STATUS(WDI_STATUS_MEM_FAILURE)) ;
@@ -6353,7 +6353,7 @@
if (NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
vos_mem_free(wdiEnterBmpsReqParams);
WDA_SendMsg(pWDA, WDA_ENTER_BMPS_RSP, NULL ,
@@ -6411,11 +6411,11 @@
tExitBmpsParams *pExitBmpsRspParams;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "<------ %s " ,__FUNCTION__);
+ "<------ %s " ,__func__);
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: pWdaParams received NULL", __FUNCTION__);
+ "%s: pWdaParams received NULL", __func__);
VOS_ASSERT(0) ;
return ;
}
@@ -6445,11 +6445,11 @@
sizeof(WDI_ExitBmpsReqParamsType)) ;
tWDA_ReqParams *pWdaParams ;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "------> %s " ,__FUNCTION__);
+ "------> %s " ,__func__);
if(NULL == wdiExitBmpsReqParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
WDA_SendExitBmpsRsp(pWDA, WDI_STATUS_MEM_FAILURE, pExitBmpsReqParams);
return VOS_STATUS_E_NOMEM;
@@ -6458,7 +6458,7 @@
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
vos_mem_free(wdiExitBmpsReqParams);
return VOS_STATUS_E_NOMEM;
@@ -6496,11 +6496,11 @@
tWDA_CbContext *pWDA;
tUapsdParams *pEnterUapsdRsqParams;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "<------ %s " ,__FUNCTION__);
+ "<------ %s " ,__func__);
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: pWdaParams received NULL", __FUNCTION__);
+ "%s: pWdaParams received NULL", __func__);
VOS_ASSERT(0) ;
return ;
}
@@ -6529,11 +6529,11 @@
sizeof(WDI_EnterUapsdReqParamsType)) ;
tWDA_ReqParams *pWdaParams ;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "------> %s " ,__FUNCTION__);
+ "------> %s " ,__func__);
if(NULL == wdiEnterUapsdReqParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
return VOS_STATUS_E_NOMEM;
}
@@ -6541,7 +6541,7 @@
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
vos_mem_free(wdiEnterUapsdReqParams);
return VOS_STATUS_E_NOMEM;
@@ -6595,11 +6595,11 @@
tExitUapsdParams *pExitUapsdRspParams;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "<------ %s " ,__FUNCTION__);
+ "<------ %s " ,__func__);
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: pWdaParams received NULL", __FUNCTION__);
+ "%s: pWdaParams received NULL", __func__);
VOS_ASSERT(0);
return;
}
@@ -6630,12 +6630,12 @@
sizeof(WDI_ExitUapsdReqParamsType)) ;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "------> %s " ,__FUNCTION__);
+ "------> %s " ,__func__);
if(NULL == wdiExitUapsdReqParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
return VOS_STATUS_E_NOMEM;
}
@@ -6643,7 +6643,7 @@
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
vos_mem_free(wdiExitUapsdReqParams);
return VOS_STATUS_E_NOMEM;
@@ -6679,11 +6679,11 @@
{
tWDA_ReqParams *pWdaParams = (tWDA_ReqParams *)pUserData;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "<------ %s " ,__FUNCTION__);
+ "<------ %s " ,__func__);
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: pWdaParams received NULL", __FUNCTION__);
+ "%s: pWdaParams received NULL", __func__);
VOS_ASSERT(0) ;
return ;
}
@@ -6717,11 +6717,11 @@
WDI_UpdateCfgReqParamsType *wdiPowerSaveCfg;
tWDA_ReqParams *pWdaParams;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "------> %s " ,__FUNCTION__);
+ "------> %s " ,__func__);
if ((NULL == pWDA) || (NULL == pPowerSaveCfg))
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: invalid param", __FUNCTION__);
+ "%s: invalid param", __func__);
VOS_ASSERT(0);
vos_mem_free(pPowerSaveCfg);
return VOS_STATUS_E_FAILURE;
@@ -6730,7 +6730,7 @@
if (NULL == wdiPowerSaveCfg)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
vos_mem_free(pPowerSaveCfg);
return VOS_STATUS_E_NOMEM;
@@ -6739,7 +6739,7 @@
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
vos_mem_free(wdiPowerSaveCfg);
vos_mem_free(pPowerSaveCfg);
@@ -6750,7 +6750,7 @@
if(NULL == configParam)
{
VOS_TRACE(VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure \n", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure \n", __func__);
VOS_ASSERT(0);
vos_mem_free(pWdaParams);
vos_mem_free(wdiPowerSaveCfg);
@@ -6865,7 +6865,7 @@
{
tWDA_ReqParams *pWdaParams = (tWDA_ReqParams *)pUserData ;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "<------ %s " ,__FUNCTION__);
+ "<------ %s " ,__func__);
vos_mem_free(pWdaParams->wdaWdiApiMsgParam) ;
vos_mem_free(pWdaParams);
@@ -6885,11 +6885,11 @@
sizeof(WDI_SetUapsdAcParamsReqParamsType)) ;
tWDA_ReqParams *pWdaParams ;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "------> %s " ,__FUNCTION__);
+ "------> %s " ,__func__);
if(NULL == wdiUapsdParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
return VOS_STATUS_E_NOMEM;
}
@@ -6897,7 +6897,7 @@
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
vos_mem_free(wdiUapsdParams);
return VOS_STATUS_E_NOMEM;
@@ -6953,12 +6953,12 @@
tWDA_ReqParams *pWdaParams = (tWDA_ReqParams *)pUserData ;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "<------ %s " ,__FUNCTION__);
+ "<------ %s " ,__func__);
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: pWdaParams received NULL", __FUNCTION__);
+ "%s: pWdaParams received NULL", __func__);
VOS_ASSERT(0) ;
return ;
}
@@ -6987,11 +6987,11 @@
tWDA_ReqParams *pWdaParams = NULL;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "------> %s " ,__FUNCTION__);
+ "------> %s " ,__func__);
if(NULL == wdiUpdateUapsdParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
return VOS_STATUS_E_NOMEM;
}
@@ -7003,7 +7003,7 @@
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
vos_mem_free(pUpdateUapsdInfo);
vos_mem_free(wdiUpdateUapsdParams);
@@ -7038,16 +7038,16 @@
{
tWDA_ReqParams *pWdaParams = (tWDA_ReqParams *)pUserData ;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "<------ %s " ,__FUNCTION__);
+ "<------ %s " ,__func__);
if(WDI_STATUS_SUCCESS != wdiStatus)
{
VOS_TRACE(VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: RXP config filter failure \n", __FUNCTION__ );
+ "%s: RXP config filter failure \n", __func__ );
}
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: pWdaParams received NULL", __FUNCTION__);
+ "%s: pWdaParams received NULL", __func__);
VOS_ASSERT(0) ;
return ;
}
@@ -7070,11 +7070,11 @@
sizeof(WDI_ConfigureRxpFilterReqParamsType)) ;
tWDA_ReqParams *pWdaParams ;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "------> %s " ,__FUNCTION__);
+ "------> %s " ,__func__);
if(NULL == wdiRxpFilterParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
vos_mem_free(pWlanSuspendParam);
return VOS_STATUS_E_NOMEM;
@@ -7083,7 +7083,7 @@
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
vos_mem_free(wdiRxpFilterParams);
vos_mem_free(pWlanSuspendParam);
@@ -7120,7 +7120,7 @@
void* pUserData)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "<------ %s " ,__FUNCTION__);
+ "<------ %s " ,__func__);
}
/*
* FUNCTION: WDA_ProcessWlanSuspendInd
@@ -7132,22 +7132,22 @@
WDI_Status wdiStatus;
WDI_SuspendParamsType wdiSuspendParams;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "------> %s " ,__FUNCTION__);
+ "------> %s " ,__func__);
wdiSuspendParams.wdiSuspendParams.ucConfiguredMcstBcstFilterSetting =
pWlanSuspendParam->configuredMcstBcstFilterSetting;
wdiSuspendParams.wdiReqStatusCB = WDA_WdiIndicationCallback;
wdiSuspendParams.pUserData = pWDA;
- VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO, "%s: %d" ,__FUNCTION__, pWlanSuspendParam->configuredMcstBcstFilterSetting);
+ VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO, "%s: %d" ,__func__, pWlanSuspendParam->configuredMcstBcstFilterSetting);
wdiStatus = WDI_HostSuspendInd(&wdiSuspendParams);
if(WDI_STATUS_PENDING == wdiStatus)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "Pending received for %s:%d ",__FUNCTION__,__LINE__ );
+ "Pending received for %s:%d ",__func__,__LINE__ );
}
else if( WDI_STATUS_SUCCESS_SYNC != wdiStatus )
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "Failure in %s:%d ",__FUNCTION__,__LINE__ );
+ "Failure in %s:%d ",__func__,__LINE__ );
}
vos_mem_free(pWlanSuspendParam);
return CONVERT_WDI2VOS_STATUS(wdiStatus) ;
@@ -7163,18 +7163,18 @@
{
tWDA_ReqParams *pWdaParams = (tWDA_ReqParams *)pUserData;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "<------ %s " ,__FUNCTION__);
+ "<------ %s " ,__func__);
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: pWdaParams received NULL", __FUNCTION__);
+ "%s: pWdaParams received NULL", __func__);
VOS_ASSERT(0) ;
return ;
}
if(WDI_STATUS_SUCCESS != resumeRspParams->wdiStatus)
{
VOS_TRACE(VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: Process Wlan Resume failure \n", __FUNCTION__ );
+ "%s: Process Wlan Resume failure \n", __func__ );
}
vos_mem_free(pWdaParams->wdaWdiApiMsgParam) ;
vos_mem_free(pWdaParams->wdaMsgParam);
@@ -7194,11 +7194,11 @@
sizeof(WDI_ResumeParamsType) ) ;
tWDA_ReqParams *pWdaParams ;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "------> %s " ,__FUNCTION__);
+ "------> %s " ,__func__);
if(NULL == wdiResumeParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
return VOS_STATUS_E_NOMEM;
}
@@ -7206,14 +7206,14 @@
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
vos_mem_free(wdiResumeParams);
return VOS_STATUS_E_NOMEM;
}
wdiResumeParams->wdiResumeParams.ucConfiguredMcstBcstFilterSetting =
pWlanResumeParam->configuredMcstBcstFilterSetting;
- VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO, "%s: %d" ,__FUNCTION__, pWlanResumeParam->configuredMcstBcstFilterSetting);
+ VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO, "%s: %d" ,__func__, pWlanResumeParam->configuredMcstBcstFilterSetting);
wdiResumeParams->wdiReqStatusCB = NULL;
pWdaParams->wdaMsgParam = pWlanResumeParam;
pWdaParams->wdaWdiApiMsgParam = wdiResumeParams;
@@ -7241,11 +7241,11 @@
{
tWDA_ReqParams *pWdaParams = (tWDA_ReqParams *)pUserData;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "<------ %s " ,__FUNCTION__);
+ "<------ %s " ,__func__);
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: pWdaParams received NULL", __FUNCTION__);
+ "%s: pWdaParams received NULL", __func__);
VOS_ASSERT(0) ;
return ;
}
@@ -7275,11 +7275,11 @@
sizeof(WDI_BeaconFilterReqParamsType) ) ;
tWDA_ReqParams *pWdaParams ;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "------> %s " ,__FUNCTION__);
+ "------> %s " ,__func__);
if(NULL == wdiBeaconFilterInfo)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
return VOS_STATUS_E_NOMEM;
}
@@ -7287,7 +7287,7 @@
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
vos_mem_free(wdiBeaconFilterInfo);
return VOS_STATUS_E_NOMEM;
@@ -7340,12 +7340,12 @@
tWDA_ReqParams *pWdaParams = (tWDA_ReqParams *)pUserData ;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "<------ %s " ,__FUNCTION__);
+ "<------ %s " ,__func__);
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: pWdaParams received NULL", __FUNCTION__);
+ "%s: pWdaParams received NULL", __func__);
VOS_ASSERT(0) ;
return ;
}
@@ -7378,11 +7378,11 @@
tWDA_ReqParams *pWdaParams ;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "------> %s " ,__FUNCTION__);
+ "------> %s " ,__func__);
if(NULL == wdiBeaconFilterInfo)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
return VOS_STATUS_E_NOMEM;
}
@@ -7398,7 +7398,7 @@
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
vos_mem_free(wdiBeaconFilterInfo);
vos_mem_free(pBeaconFilterInfo);
@@ -7433,11 +7433,11 @@
{
tWDA_ReqParams *pWdaParams = (tWDA_ReqParams *)pUserData;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "<------ %s " ,__FUNCTION__);
+ "<------ %s " ,__func__);
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: pWdaParams received NULL", __FUNCTION__);
+ "%s: pWdaParams received NULL", __func__);
VOS_ASSERT(0) ;
return ;
}
@@ -7462,11 +7462,11 @@
sizeof(WDI_SetRSSIThresholdsReqParamsType)) ;
tWDA_ReqParams *pWdaParams ;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "------> %s " ,__FUNCTION__);
+ "------> %s " ,__func__);
if(NULL == wdiRSSIThresholdsInfo)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
return VOS_STATUS_E_NOMEM;
}
@@ -7474,7 +7474,7 @@
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
vos_mem_free(wdiRSSIThresholdsInfo);
return VOS_STATUS_E_NOMEM;
@@ -7520,11 +7520,11 @@
tWDA_ReqParams *pWdaParams = (tWDA_ReqParams *)pUserData ;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "<------ %s " ,__FUNCTION__);
+ "<------ %s " ,__func__);
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: pWdaParams received NULL", __FUNCTION__);
+ "%s: pWdaParams received NULL", __func__);
VOS_ASSERT(0) ;
return ;
}
@@ -7554,12 +7554,12 @@
tWDA_ReqParams *pWdaParams ;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "------> %s: offloadType=%x" ,__FUNCTION__, pHostOffloadParams->offloadType);
+ "------> %s: offloadType=%x" ,__func__, pHostOffloadParams->offloadType);
if(NULL == wdiHostOffloadInfo)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
return VOS_STATUS_E_NOMEM;
}
@@ -7567,7 +7567,7 @@
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
vos_mem_free(wdiHostOffloadInfo);
vos_mem_free(pHostOffloadParams);
@@ -7686,12 +7686,12 @@
tWDA_ReqParams *pWdaParams = (tWDA_ReqParams *)pUserData ;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "<------ %s " ,__FUNCTION__);
+ "<------ %s " ,__func__);
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: pWdaParams received NULL", __FUNCTION__);
+ "%s: pWdaParams received NULL", __func__);
VOS_ASSERT(0) ;
return ;
}
@@ -7721,11 +7721,11 @@
tWDA_ReqParams *pWdaParams;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "------> %s " ,__FUNCTION__);
+ "------> %s " ,__func__);
if(NULL == wdiKeepAliveInfo)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
vos_mem_free(pKeepAliveParams);
return VOS_STATUS_E_NOMEM;
@@ -7735,7 +7735,7 @@
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
vos_mem_free(wdiKeepAliveInfo);
vos_mem_free(pKeepAliveParams);
@@ -7830,11 +7830,11 @@
{
tWDA_ReqParams *pWdaParams = (tWDA_ReqParams *)pUserData;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "<------ %s " ,__FUNCTION__);
+ "<------ %s " ,__func__);
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: pWdaParams received NULL", __FUNCTION__);
+ "%s: pWdaParams received NULL", __func__);
VOS_ASSERT(0) ;
return ;
}
@@ -7857,11 +7857,11 @@
sizeof(WDI_WowlAddBcPtrnReqParamsType)) ;
tWDA_ReqParams *pWdaParams ;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "------> %s " ,__FUNCTION__);
+ "------> %s " ,__func__);
if(NULL == wdiWowlAddBcPtrnInfo)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
return VOS_STATUS_E_NOMEM;
}
@@ -7869,7 +7869,7 @@
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
vos_mem_free(wdiWowlAddBcPtrnInfo);
return VOS_STATUS_E_NOMEM;
@@ -7941,11 +7941,11 @@
{
tWDA_ReqParams *pWdaParams = (tWDA_ReqParams *)pUserData;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "<------ %s " ,__FUNCTION__);
+ "<------ %s " ,__func__);
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: pWdaParams received NULL", __FUNCTION__);
+ "%s: pWdaParams received NULL", __func__);
VOS_ASSERT(0) ;
return ;
}
@@ -7968,11 +7968,11 @@
sizeof(WDI_WowlDelBcPtrnReqParamsType)) ;
tWDA_ReqParams *pWdaParams ;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "------> %s " ,__FUNCTION__);
+ "------> %s " ,__func__);
if(NULL == wdiWowlDelBcPtrnInfo)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
return VOS_STATUS_E_NOMEM;
}
@@ -7980,7 +7980,7 @@
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
vos_mem_free(wdiWowlDelBcPtrnInfo);
return VOS_STATUS_E_NOMEM;
@@ -8021,11 +8021,11 @@
tWDA_CbContext *pWDA;
tSirHalWowlEnterParams *pWowlEnterParams;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "<------ %s " ,__FUNCTION__);
+ "<------ %s " ,__func__);
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: pWdaParams received NULL", __FUNCTION__);
+ "%s: pWdaParams received NULL", __func__);
VOS_ASSERT(0) ;
return ;
}
@@ -8056,11 +8056,11 @@
sizeof(WDI_WowlEnterReqParamsType)) ;
tWDA_ReqParams *pWdaParams ;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "------> %s " ,__FUNCTION__);
+ "------> %s " ,__func__);
if(NULL == wdiWowlEnterInfo)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
return VOS_STATUS_E_NOMEM;
}
@@ -8068,7 +8068,7 @@
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
vos_mem_free(wdiWowlEnterInfo);
return VOS_STATUS_E_NOMEM;
@@ -8142,11 +8142,11 @@
tWDA_CbContext *pWDA;
tSirHalWowlExitParams *pWowlExitParams;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "<------ %s " ,__FUNCTION__);
+ "<------ %s " ,__func__);
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: pWdaParams received NULL", __FUNCTION__);
+ "%s: pWdaParams received NULL", __func__);
VOS_ASSERT(0) ;
return ;
}
@@ -8160,7 +8160,7 @@
vos_mem_free(pWdaParams) ;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "<------ %s " ,__FUNCTION__);
+ "<------ %s " ,__func__);
WDA_SendMsg(pWDA, WDA_WOWL_EXIT_RSP, (void *)pWowlExitParams, 0) ;
return ;
}
@@ -8178,11 +8178,11 @@
sizeof(WDI_WowlExitReqParamsType)) ;
tWDA_ReqParams *pWdaParams ;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "------> %s " ,__FUNCTION__);
+ "------> %s " ,__func__);
if(NULL == wdiWowlExitInfo)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
return VOS_STATUS_E_NOMEM;
}
@@ -8190,7 +8190,7 @@
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
vos_mem_free(wdiWowlExitInfo);
return VOS_STATUS_E_NOMEM;
@@ -8243,12 +8243,12 @@
tWDA_CbContext *pWDA;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "<------ %s " ,__FUNCTION__);
+ "<------ %s " ,__func__);
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: pWdaParams received NULL", __FUNCTION__);
+ "%s: pWdaParams received NULL", __func__);
VOS_ASSERT(0) ;
return ;
}
@@ -8277,11 +8277,11 @@
tWDA_ReqParams *pWdaParams ;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "------> %s " ,__FUNCTION__);
+ "------> %s " ,__func__);
if(NULL == pWDA)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s:pWDA is NULL", __FUNCTION__);
+ "%s:pWDA is NULL", __func__);
VOS_ASSERT(0);
return VOS_STATUS_E_FAILURE;
}
@@ -8293,7 +8293,7 @@
if(NULL == wdiNvDownloadReqParam)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
return VOS_STATUS_E_NOMEM;
}
@@ -8305,7 +8305,7 @@
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
vos_mem_free(wdiNvDownloadReqParam);
return VOS_STATUS_E_NOMEM;
@@ -8342,11 +8342,11 @@
tFlushACReq *pFlushACReqParams;
tFlushACRsp *pFlushACRspParams;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "<------ %s " ,__FUNCTION__);
+ "<------ %s " ,__func__);
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: pWdaParams received NULL", __FUNCTION__);
+ "%s: pWdaParams received NULL", __func__);
VOS_ASSERT(0) ;
return ;
}
@@ -8356,7 +8356,7 @@
if(NULL == pFlushACRspParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
vos_mem_free(pWdaParams);
return ;
@@ -8392,7 +8392,7 @@
if(NULL == wdiFlushAcReqParam)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
return VOS_STATUS_E_NOMEM;
}
@@ -8400,13 +8400,13 @@
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
vos_mem_free(wdiFlushAcReqParam);
return VOS_STATUS_E_NOMEM;
}
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "------> %s " ,__FUNCTION__);
+ "------> %s " ,__func__);
wdiFlushAcReqParam->wdiFlushAcInfo.ucSTAId = pFlushAcReqParams->ucSTAId;
wdiFlushAcReqParam->wdiFlushAcInfo.ucTid = pFlushAcReqParams->ucTid;
wdiFlushAcReqParam->wdiFlushAcInfo.usMesgLen = pFlushAcReqParams->mesgLen;
@@ -8440,11 +8440,11 @@
WDI_BtAmpEventParamsType *wdiBtAmpEventParam;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "<------ %s " ,__FUNCTION__);
+ "<------ %s " ,__func__);
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: pWdaParams received NULL", __FUNCTION__);
+ "%s: pWdaParams received NULL", __func__);
VOS_ASSERT(0) ;
return ;
}
@@ -8478,11 +8478,11 @@
sizeof(WDI_BtAmpEventParamsType)) ;
tWDA_ReqParams *pWdaParams ;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "------> %s " ,__FUNCTION__);
+ "------> %s " ,__func__);
if(NULL == wdiBtAmpEventParam)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
return VOS_STATUS_E_NOMEM;
}
@@ -8490,7 +8490,7 @@
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
vos_mem_free(wdiBtAmpEventParam);
return VOS_STATUS_E_NOMEM;
@@ -8533,7 +8533,7 @@
if((NULL == pWDA) || (NULL == ftmCmdRspData))
{
VOS_TRACE(VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s, invalid input 0x%x, 0x%x",__FUNCTION__, pWDA, ftmCmdRspData);
+ "%s, invalid input 0x%x, 0x%x",__func__, pWDA, ftmCmdRspData);
return;
}
/* Release Current FTM Command Request */
@@ -8585,12 +8585,12 @@
tStartOemDataRsp *pOemDataRspParams = NULL ;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "<------ %s " ,__FUNCTION__);
+ "<------ %s " ,__func__);
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: pWdaParams received NULL", __FUNCTION__);
+ "%s: pWdaParams received NULL", __func__);
VOS_ASSERT(0) ;
return ;
}
@@ -8599,7 +8599,7 @@
if(NULL == pWDA)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s:pWDA is NULL", __FUNCTION__);
+ "%s:pWDA is NULL", __func__);
VOS_ASSERT(0);
return ;
}
@@ -8654,7 +8654,7 @@
if(NULL == wdiOemDataReqParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
return VOS_STATUS_E_NOMEM;
}
@@ -8670,7 +8670,7 @@
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
vos_mem_free(wdiOemDataReqParams);
vos_mem_free(pOemDataReqParams);
VOS_ASSERT(0);
@@ -8702,11 +8702,11 @@
{
tWDA_ReqParams *pWdaParams = (tWDA_ReqParams *)pUserData;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "<------ %s " ,__FUNCTION__);
+ "<------ %s " ,__func__);
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: pWdaParams received NULL", __FUNCTION__);
+ "%s: pWdaParams received NULL", __func__);
VOS_ASSERT(0) ;
return ;
}
@@ -8734,7 +8734,7 @@
tWDA_ReqParams *pWdaParams = (tWDA_ReqParams *)pUserData;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "<------ %s " ,__FUNCTION__);
+ "<------ %s " ,__func__);
VOS_ASSERT(NULL != pWdaParams);
@@ -8764,12 +8764,12 @@
tWDA_ReqParams *pWdaParams ;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "------> %s " ,__FUNCTION__);
+ "------> %s " ,__func__);
if(NULL == wdiGtkOffloadReqMsg)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
return VOS_STATUS_E_NOMEM;
}
@@ -8778,7 +8778,7 @@
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
vos_mem_free(wdiGtkOffloadReqMsg);
return VOS_STATUS_E_NOMEM;
@@ -8840,7 +8840,7 @@
vos_msg_t vosMsg;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "<------ %s " ,__FUNCTION__);
+ "<------ %s " ,__func__);
VOS_ASSERT(NULL != pWdaParams);
@@ -8891,11 +8891,11 @@
sizeof(WDI_SetTxPerTrackingReqParamsType)) ;
tWDA_ReqParams *pWdaParams ;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "------> %s " ,__FUNCTION__);
+ "------> %s " ,__func__);
if(NULL == pwdiSetTxPerTrackingReqParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
vos_mem_free(pTxPerTrackingParams);
VOS_ASSERT(0);
return VOS_STATUS_E_NOMEM;
@@ -8904,7 +8904,7 @@
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
vos_mem_free(pwdiSetTxPerTrackingReqParams);
vos_mem_free(pTxPerTrackingParams);
VOS_ASSERT(0);
@@ -8952,7 +8952,7 @@
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: pWdaParams received NULL", __FUNCTION__);
+ "%s: pWdaParams received NULL", __func__);
VOS_ASSERT(0) ;
return ;
}
@@ -8993,7 +8993,7 @@
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
return VOS_STATUS_E_NOMEM;
}
/* Allocate memory WDI request structure*/
@@ -9029,12 +9029,12 @@
if ( vStatus == VOS_STATUS_E_TIMEOUT )
{
VOS_TRACE( VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: Timeout occured before WDA_HALDUMP complete\n",__FUNCTION__);
+ "%s: Timeout occured before WDA_HALDUMP complete\n",__func__);
}
else
{
VOS_TRACE( VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: WDA_HALDUMP reporting other error \n",__FUNCTION__);
+ "%s: WDA_HALDUMP reporting other error \n",__func__);
}
VOS_ASSERT(0);
}
@@ -9056,7 +9056,7 @@
if(NULL == pwdiGtkOffloadGetInfoReqMsg)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
return VOS_STATUS_E_NOMEM;
}
@@ -9065,7 +9065,7 @@
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
vos_mem_free(pwdiGtkOffloadGetInfoReqMsg);
return VOS_STATUS_E_NOMEM;
@@ -9123,7 +9123,7 @@
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
"%s:pWDA is NULL",
- __FUNCTION__);
+ __func__);
VOS_ASSERT(0);
return VOS_STATUS_E_FAILURE;
}
@@ -9151,7 +9151,7 @@
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_WARN,
"%s:packet (0x%X) is already freed",
- __FUNCTION__, pData);
+ __func__, pData);
//Return from here since we reaching here because the packet already timeout
return status;
}
@@ -9197,7 +9197,7 @@
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
"%s:pWDA %x or pFrmBuf %x is NULL",
- __FUNCTION__,pWDA,pFrmBuf);
+ __func__,pWDA,pFrmBuf);
VOS_ASSERT(0);
return VOS_STATUS_E_FAILURE;
}
@@ -9208,7 +9208,7 @@
if(NULL == pMac)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s:pMac is NULL", __FUNCTION__);
+ "%s:pMac is NULL", __func__);
VOS_ASSERT(0);
return VOS_STATUS_E_FAILURE;
}
@@ -9345,7 +9345,7 @@
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
"%s: Status %d when waiting for TX Frame Event",
- __FUNCTION__, status);
+ __func__, status);
pWDA->pTxCbFunc = NULL; /*To stop the limTxComplete being called again ,
after the packet gets completed(packet freed once)*/
@@ -9390,19 +9390,19 @@
if(NULL == pMsg)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s:pMsg is NULL", __FUNCTION__);
+ "%s:pMsg is NULL", __func__);
VOS_ASSERT(0);
return VOS_STATUS_E_FAILURE;
}
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO_LOW,
- "=========> %s msgType: %x " ,__FUNCTION__, pMsg->type);
+ "=========> %s msgType: %x " ,__func__, pMsg->type);
pWDA = (tWDA_CbContext *)vos_get_context( VOS_MODULE_ID_WDA, pVosContext );
if(NULL == pWDA )
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s:pWDA is NULL", __FUNCTION__);
+ "%s:pWDA is NULL", __func__);
VOS_ASSERT(0);
vos_mem_free(pMsg->bodyptr);
return VOS_STATUS_E_FAILURE;
@@ -10005,7 +10005,7 @@
if(NULL == pWDA)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s:pWDA is NULL", __FUNCTION__);
+ "%s:pWDA is NULL", __func__);
VOS_ASSERT(0);
return ;
}
@@ -10061,7 +10061,7 @@
if(NULL == pMicInd)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
break;
}
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
@@ -10113,7 +10113,7 @@
if(NULL == pDelSTACtx)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
break;
}
vos_mem_copy(pDelSTACtx->addr2,
@@ -10140,7 +10140,7 @@
if(NULL == pSmeCoexInd)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure-pSmeCoexInd", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure-pSmeCoexInd", __func__);
break;
}
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
@@ -10376,7 +10376,7 @@
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: pWdaParams received NULL", __FUNCTION__);
+ "%s: pWdaParams received NULL", __func__);
VOS_ASSERT(0) ;
return ;
}
@@ -10385,7 +10385,7 @@
vos_mem_free(pWdaParams->wdaWdiApiMsgParam);
vos_mem_free(pWdaParams) ;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "<------ %s " ,__FUNCTION__);
+ "<------ %s " ,__func__);
if(WDI_STATUS_SUCCESS == wdiTriggerBaRsp->wdiStatus)
{
tANI_U8 i = 0 ;
@@ -10399,7 +10399,7 @@
if(NULL == baActivityInd)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0) ;
return;
}
@@ -10449,7 +10449,7 @@
if(NULL == pWDA)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s:pWDA is NULL", __FUNCTION__);
+ "%s:pWDA is NULL", __func__);
VOS_ASSERT(0);
return ;
}
@@ -10511,7 +10511,7 @@
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0) ;
return;
}
@@ -10520,7 +10520,7 @@
if(NULL == wdiTriggerBaReq)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0) ;
vos_mem_free(pWdaParams);
return;
@@ -10538,7 +10538,7 @@
} while(0) ;
wdiTriggerBaReq->wdiReqStatusCB = NULL ;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "------> %s " ,__FUNCTION__);
+ "------> %s " ,__func__);
pWdaParams->pWdaContext = pWDA;
pWdaParams->wdaWdiApiMsgParam = wdiTriggerBaReq ;
pWdaParams->wdaMsgParam = NULL;
@@ -10586,7 +10586,7 @@
if(NULL == pMac)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s:MAC context is NULL", __FUNCTION__);
+ "%s:MAC context is NULL", __func__);
VOS_ASSERT(0);
return VOS_STATUS_E_FAILURE;
}
@@ -10714,11 +10714,11 @@
{
tWDA_ReqParams *pWdaParams = (tWDA_ReqParams *)pUserData;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "<------ %s " ,__FUNCTION__);
+ "<------ %s " ,__func__);
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: pWdaParams received NULL", __FUNCTION__);
+ "%s: pWdaParams received NULL", __func__);
VOS_ASSERT(0) ;
return ;
}
@@ -10746,11 +10746,11 @@
{
tWDA_ReqParams *pWdaParams = (tWDA_ReqParams *)pUserData;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "<------ %s " ,__FUNCTION__);
+ "<------ %s " ,__func__);
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: pWdaParams received NULL", __FUNCTION__);
+ "%s: pWdaParams received NULL", __func__);
VOS_ASSERT(0) ;
return ;
}
@@ -10777,11 +10777,11 @@
tWDA_ReqParams *pWdaParams = (tWDA_ReqParams *)pUserData;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "<------ %s " ,__FUNCTION__);
+ "<------ %s " ,__func__);
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: pWdaParams received NULL", __FUNCTION__);
+ "%s: pWdaParams received NULL", __func__);
VOS_ASSERT(0) ;
return ;
}
@@ -10812,11 +10812,11 @@
tWDA_ReqParams *pWdaParams ;
v_U8_t i;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "------> %s " ,__FUNCTION__);
+ "------> %s " ,__func__);
if(NULL == pwdiPNOScanReqInfo)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
return VOS_STATUS_E_NOMEM;
}
@@ -10824,7 +10824,7 @@
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
vos_mem_free(pwdiPNOScanReqInfo);
return VOS_STATUS_E_NOMEM;
@@ -10890,7 +10890,7 @@
tWDA_ReqParams *pWdaParams = (tWDA_ReqParams *)pUserData;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "<------ %s " ,__FUNCTION__);
+ "<------ %s " ,__func__);
VOS_ASSERT(NULL != pWdaParams);
@@ -10912,11 +10912,11 @@
(WDI_SetRssiFilterReqParamsType *)vos_mem_malloc(sizeof(WDI_SetRssiFilterReqParamsType)) ;
tWDA_ReqParams *pWdaParams ;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "------> %s " ,__FUNCTION__);
+ "------> %s " ,__func__);
if(NULL == pwdiSetRssiFilterReqInfo)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
return VOS_STATUS_E_NOMEM;
}
@@ -10924,7 +10924,7 @@
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
vos_mem_free(pwdiSetRssiFilterReqInfo);
return VOS_STATUS_E_NOMEM;
@@ -10966,11 +10966,11 @@
tWDA_ReqParams *pWdaParams ;
v_U8_t i;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "------> %s " ,__FUNCTION__);
+ "------> %s " ,__func__);
if(NULL == wdiUpdateScanParamsInfoType)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
return VOS_STATUS_E_NOMEM;
}
@@ -10978,7 +10978,7 @@
if ( NULL == pWdaParams )
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
vos_mem_free(wdiUpdateScanParamsInfoType);
return VOS_STATUS_E_NOMEM;
@@ -11067,11 +11067,11 @@
{
tWDA_ReqParams *pWdaParams = (tWDA_ReqParams *)pUserData;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "<------ %s " ,__FUNCTION__);
+ "<------ %s " ,__func__);
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: pWdaParams received NULL", __FUNCTION__);
+ "%s: pWdaParams received NULL", __func__);
VOS_ASSERT(0) ;
return ;
}
@@ -11096,7 +11096,7 @@
tWDA_ReqParams *pWdaParams ;
tANI_U8 i;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "------> %s " ,__FUNCTION__);
+ "------> %s " ,__func__);
pwdiFltPktSetMcListReqParamsType =
(WDI_RcvFltPktSetMcListReqParamsType *)vos_mem_malloc(
sizeof(WDI_RcvFltPktSetMcListReqParamsType)
@@ -11104,14 +11104,14 @@
if(NULL == pwdiFltPktSetMcListReqParamsType)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
return VOS_STATUS_E_NOMEM;
}
pWdaParams = (tWDA_ReqParams *)vos_mem_malloc(sizeof(tWDA_ReqParams)) ;
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
vos_mem_free(pwdiFltPktSetMcListReqParamsType);
return VOS_STATUS_E_NOMEM;
}
@@ -11164,12 +11164,12 @@
{
tWDA_ReqParams *pWdaParams = (tWDA_ReqParams *)pUserData;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "<------ %s " ,__FUNCTION__);
+ "<------ %s " ,__func__);
/*WDA_VOS_ASSERT(NULL != pWdaParams);*/
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: pWdaParams received NULL", __FUNCTION__);
+ "%s: pWdaParams received NULL", __func__);
VOS_ASSERT(0) ;
return ;
}
@@ -11197,11 +11197,11 @@
tWDA_ReqParams *pWdaParams ;
tANI_U8 i;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "------> %s " ,__FUNCTION__);
+ "------> %s " ,__func__);
if(NULL == pwdiSetRcvPktFilterReqParamsType)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
return VOS_STATUS_E_NOMEM;
}
@@ -11209,7 +11209,7 @@
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
vos_mem_free(pwdiSetRcvPktFilterReqParamsType);
return VOS_STATUS_E_NOMEM;
@@ -11312,13 +11312,13 @@
vos_msg_t vosMsg;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "<------ %s " ,__FUNCTION__);
+ "<------ %s " ,__func__);
/*WDA_VOS_ASSERT(NULL != pWdaParams);*/
if(NULL == pRcvFltPktMatchCntRsp)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: pRcvFltPktMatchCntRsp is NULL", __FUNCTION__);
+ "%s: pRcvFltPktMatchCntRsp is NULL", __func__);
VOS_ASSERT(0) ;
vos_mem_free(pWdaParams);
return ;
@@ -11327,7 +11327,7 @@
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: pWdaParams received NULL", __FUNCTION__);
+ "%s: pWdaParams received NULL", __func__);
VOS_ASSERT(0) ;
vos_mem_free(pRcvFltPktMatchCntRsp);
return ;
@@ -11373,11 +11373,11 @@
(WDI_RcvFltPktMatchCntReqParamsType *)vos_mem_malloc(sizeof(WDI_RcvFltPktMatchCntReqParamsType));
tWDA_ReqParams *pWdaParams ;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "------> %s " ,__FUNCTION__);
+ "------> %s " ,__func__);
if(NULL == pwdiRcvFltPktMatchCntReqParamsType)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
return VOS_STATUS_E_NOMEM;
}
@@ -11385,7 +11385,7 @@
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
vos_mem_free(pwdiRcvFltPktMatchCntReqParamsType);
return VOS_STATUS_E_NOMEM;
@@ -11427,12 +11427,12 @@
{
tWDA_ReqParams *pWdaParams = (tWDA_ReqParams *)pUserData;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "<------ %s " ,__FUNCTION__);
+ "<------ %s " ,__func__);
/* WDA_VOS_ASSERT(NULL != pWdaParams); */
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: pWdaParams received NULL", __FUNCTION__);
+ "%s: pWdaParams received NULL", __func__);
VOS_ASSERT(0) ;
return ;
}
@@ -11457,11 +11457,11 @@
(WDI_RcvFltPktClearReqParamsType *)vos_mem_malloc(sizeof(WDI_RcvFltPktClearReqParamsType));
tWDA_ReqParams *pWdaParams ;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "------> %s " ,__FUNCTION__);
+ "------> %s " ,__func__);
if(NULL == pwdiRcvFltPktClearReqParamsType)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
return VOS_STATUS_E_NOMEM;
}
@@ -11469,7 +11469,7 @@
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
vos_mem_free(pwdiRcvFltPktClearReqParamsType);
return VOS_STATUS_E_NOMEM;
@@ -11512,11 +11512,11 @@
(WDI_SetPowerParamsReqParamsType *)vos_mem_malloc(sizeof(WDI_SetPowerParamsReqParamsType)) ;
tWDA_ReqParams *pWdaParams ;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "------> %s " ,__FUNCTION__);
+ "------> %s " ,__func__);
if(NULL == pwdiSetPowerParamsReqInfo)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
return VOS_STATUS_E_NOMEM;
}
@@ -11524,7 +11524,7 @@
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
vos_mem_free(pwdiSetPowerParamsReqInfo);
return VOS_STATUS_E_NOMEM;
@@ -11574,12 +11574,12 @@
tWDA_ReqParams *pWdaParams = (tWDA_ReqParams *)pUserData;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "<------ %s " ,__FUNCTION__);
+ "<------ %s " ,__func__);
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: pWdaParams received NULL", __FUNCTION__);
+ "%s: pWdaParams received NULL", __func__);
VOS_ASSERT(0) ;
return ;
}
@@ -11612,7 +11612,7 @@
if(NULL == wdiSetTmLevelReq)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
return VOS_STATUS_E_NOMEM;
}
@@ -11621,14 +11621,14 @@
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
vos_mem_free(wdiSetTmLevelReq);
return VOS_STATUS_E_NOMEM;
}
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "------> %s " ,__FUNCTION__);
+ "------> %s " ,__func__);
wdiSetTmLevelReq->tmMode = setTmLevelReq->tmMode;
wdiSetTmLevelReq->tmLevel = setTmLevelReq->newTmLevel;
@@ -11658,11 +11658,11 @@
VOS_STATUS wdaStatus;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "------> %s " ,__FUNCTION__);
+ "------> %s " ,__func__);
if( pTxCtrlParam == NULL )
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: Input tpTxControlParams is NULL", __FUNCTION__);
+ "%s: Input tpTxControlParams is NULL", __func__);
return VOS_STATUS_E_FAILURE;
}
if( pTxCtrlParam->stopTx == eANI_BOOLEAN_TRUE )
@@ -11682,7 +11682,7 @@
void WDA_featureCapsExchange(v_PVOID_t pVosContext)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "%s:enter", __FUNCTION__ );
+ "%s:enter", __func__ );
WDI_featureCapsExchangeReq( NULL, pVosContext);
}
@@ -11724,7 +11724,7 @@
if (NULL == pWDA)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: Invoked with invalid pWDA", __FUNCTION__ );
+ "%s: Invoked with invalid pWDA", __func__ );
VOS_ASSERT(0);
return VOS_STATUS_E_FAILURE;
}
@@ -11827,11 +11827,11 @@
{
tWDA_ReqParams *pWdaParams = (tWDA_ReqParams *)pUserData;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "<------ %s " ,__FUNCTION__);
+ "<------ %s " ,__func__);
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: pWdaParams received NULL", __FUNCTION__);
+ "%s: pWdaParams received NULL", __func__);
VOS_ASSERT(0) ;
return ;
}
@@ -11857,7 +11857,7 @@
if(NULL == wdiTemp)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
return VOS_STATUS_E_NOMEM;
}
@@ -11865,7 +11865,7 @@
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __FUNCTION__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
vos_mem_free(wdiTemp);
return VOS_STATUS_E_NOMEM;
diff --git a/CORE/WDA/src/wlan_qct_wda_legacy.c b/CORE/WDA/src/wlan_qct_wda_legacy.c
index 92ad5f0..a707015 100644
--- a/CORE/WDA/src/wlan_qct_wda_legacy.c
+++ b/CORE/WDA/src/wlan_qct_wda_legacy.c
@@ -317,7 +317,7 @@
if(NULL == wdaContext)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s:WDA context is NULL", __FUNCTION__);
+ "%s:WDA context is NULL", __func__);
VOS_ASSERT(0);
return eSYSTEM_UNKNOWN_ROLE;
}
diff --git a/CORE/WDI/CP/src/wlan_qct_wdi.c b/CORE/WDI/CP/src/wlan_qct_wdi.c
index 5ed8e65..54c2c86 100644
--- a/CORE/WDI/CP/src/wlan_qct_wdi.c
+++ b/CORE/WDI/CP/src/wlan_qct_wdi.c
@@ -1040,7 +1040,7 @@
{
WPAL_TRACE(eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_FATAL,
"%s: Failure while initializing STA Table, status %d",
- __FUNCTION__, wdiStatus);
+ __func__, wdiStatus);
goto fail_STATableInit;
}
@@ -1052,7 +1052,7 @@
{
WPAL_TRACE(eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_FATAL,
"%s: Failed to open PAL, status %d",
- __FUNCTION__, wptStatus);
+ __func__, wptStatus);
goto fail_wpalOpen;
}
@@ -1063,7 +1063,7 @@
{
WPAL_TRACE(eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_FATAL,
"%s: Failed to init mutex, status %d",
- __FUNCTION__, wptStatus);
+ __func__, wptStatus);
goto fail_mutex;
}
@@ -1076,7 +1076,7 @@
{
WPAL_TRACE(eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_FATAL,
"%s: Failed to init response timer, status %d",
- __FUNCTION__, wptStatus);
+ __func__, wptStatus);
goto fail_timer;
}
@@ -1087,7 +1087,7 @@
{
WPAL_TRACE(eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_FATAL,
"%s: Failed to init SSR timer, status %d",
- __FUNCTION__, wptStatus);
+ __func__, wptStatus);
goto fail_timer2;
}
/* Initialize the WDI Pending Request Queue*/
@@ -1096,7 +1096,7 @@
{
WPAL_TRACE(eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_FATAL,
"%s: Failed to init pending request queue, status %d",
- __FUNCTION__, wptStatus);
+ __func__, wptStatus);
goto fail_pend_queue;
}
@@ -1106,7 +1106,7 @@
{
WPAL_TRACE(eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_FATAL,
"%s: Failed to init assoc session queue, status %d",
- __FUNCTION__, wptStatus);
+ __func__, wptStatus);
goto fail_assoc_queue;
}
@@ -1118,7 +1118,7 @@
{
WPAL_TRACE(eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_FATAL,
"%s: Failed to init BSS %d pending queue, status %d",
- __FUNCTION__, i, wptStatus);
+ __func__, i, wptStatus);
goto fail_bss_queue;
}
}
@@ -1134,7 +1134,7 @@
{
WPAL_TRACE(eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_FATAL,
"%s: Failed to initialize the DP Util Module, status %d",
- __FUNCTION__, wdiStatus);
+ __func__, wdiStatus);
goto fail_dp_util_init;
}
@@ -1144,7 +1144,7 @@
{
WPAL_TRACE(eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_FATAL,
"%s: Failed to initialize power state event, status %d",
- __FUNCTION__, wptStatus);
+ __func__, wptStatus);
goto fail_power_event;
}
@@ -1154,7 +1154,7 @@
{
WPAL_TRACE(eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_FATAL,
"%s: Failed to initialize WCTS action event, status %d",
- __FUNCTION__, wptStatus);
+ __func__, wptStatus);
goto fail_wcts_event;
}
@@ -1174,7 +1174,7 @@
if ( NULL == gWDICb.wctsHandle )
{
WPAL_TRACE(eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_FATAL,
- "%s: Failed to open WCTS transport", __FUNCTION__);
+ "%s: Failed to open WCTS transport", __func__);
goto fail_wcts_open;
}
@@ -1188,7 +1188,7 @@
if(eWLAN_PAL_STATUS_SUCCESS != WDTS_openTransport(&gWDICb))
{
WPAL_TRACE(eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_FATAL,
- "%s: Failed to open the DT Transport", __FUNCTION__);
+ "%s: Failed to open the DT Transport", __func__);
goto fail_wdts_open;
}
}
@@ -1222,7 +1222,7 @@
if ( eWLAN_PAL_STATUS_SUCCESS != eventStatus )
{
WPAL_TRACE(eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Failed to reset WCTS action event", __FUNCTION__);
+ "%s: Failed to reset WCTS action event", __func__);
}
WCTS_CloseTransport(gWDICb.wctsHandle);
@@ -1238,7 +1238,7 @@
if ( eWLAN_PAL_STATUS_SUCCESS != eventStatus )
{
WPAL_TRACE(eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Failed to wait on WCTS action event", __FUNCTION__);
+ "%s: Failed to wait on WCTS action event", __func__);
}
}
else
@@ -1464,7 +1464,7 @@
if ( eWLAN_PAL_STATUS_SUCCESS != eventStatus )
{
WPAL_TRACE(eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Failed to reset WCTS action event", __FUNCTION__);
+ "%s: Failed to reset WCTS action event", __func__);
/* fall through and try to finish closing via the FSM */
}
@@ -1490,7 +1490,7 @@
if ( eWLAN_PAL_STATUS_SUCCESS != eventStatus )
{
WPAL_TRACE(eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Failed to wait on WCTS action event", __FUNCTION__);
+ "%s: Failed to wait on WCTS action event", __func__);
}
}
@@ -1611,7 +1611,7 @@
if ( eWLAN_PAL_STATUS_SUCCESS != wptStatus )
{
WPAL_TRACE(eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_FATAL,
- "%s: Failed to process shutdown event", __FUNCTION__);
+ "%s: Failed to process shutdown event", __func__);
}
/* Destroy the Set Power State event */
wptStatus = wpalEventDelete(&gWDICb.setPowerStateEvent);
@@ -1663,7 +1663,7 @@
if ( eWLAN_PAL_STATUS_SUCCESS != wptStatus )
{
WPAL_TRACE(eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_ERROR,
- "%s: Failed to delete mutex %d", __FUNCTION__, wptStatus);
+ "%s: Failed to delete mutex %d", __func__, wptStatus);
WDI_ASSERT(0);
}
/* Free the global variables */
@@ -6341,7 +6341,7 @@
( NULL == (wdiStartRspCb = (WDI_StartRspCb)pEventData->pCBfnc)))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_FATAL,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -6433,7 +6433,7 @@
( NULL == (wdiStopRspCb = (WDI_StopRspCb)pEventData->pCBfnc)))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -6612,7 +6612,7 @@
( NULL == (wdiInitScanRspCb = (WDI_InitScanRspCb)pEventData->pCBfnc)))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -6793,7 +6793,7 @@
( NULL == (wdiStartScanRspCb = (WDI_StartScanRspCb)pEventData->pCBfnc)))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -6888,7 +6888,7 @@
( NULL == (wdiEndScanRspCb = (WDI_EndScanRspCb)pEventData->pCBfnc)))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -6986,7 +6986,7 @@
( NULL == pEventData->pCBfnc))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -7256,7 +7256,7 @@
( NULL == (wdiJoinRspCb = (WDI_JoinRspCb)pEventData->pCBfnc)))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -7330,7 +7330,7 @@
( NULL == pEventData->pCBfnc ))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -7538,7 +7538,7 @@
( NULL == (wdiDelBSSRspCb = (WDI_DelBSSRspCb)pEventData->pCBfnc)))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -7681,7 +7681,7 @@
( NULL == (wdiPostAssocRspCb = (WDI_PostAssocRspCb)pEventData->pCBfnc)))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -7878,7 +7878,7 @@
( NULL == pEventData->pCBfnc ))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -8003,7 +8003,7 @@
( NULL == pEventData->pCBfnc ))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -8149,7 +8149,7 @@
( NULL == pEventData->pCBfnc ))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -8277,7 +8277,7 @@
( NULL == pEventData->pCBfnc ))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -8452,7 +8452,7 @@
( NULL == pEventData->pCBfnc ))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -8592,7 +8592,7 @@
( NULL == pEventData->pCBfnc ))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -8767,7 +8767,7 @@
( NULL == pEventData->pCBfnc ))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -8909,7 +8909,7 @@
( NULL == pEventData->pCBfnc ))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -9088,7 +9088,7 @@
( NULL == pEventData->pCBfnc ))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -9200,7 +9200,7 @@
( NULL == pEventData->pCBfnc ))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -9315,7 +9315,7 @@
( NULL == pEventData->pCBfnc ))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -9459,7 +9459,7 @@
( NULL == pEventData->pCBfnc ))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -9571,7 +9571,7 @@
( NULL == pEventData->pCBfnc ))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_ERROR,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -9680,7 +9680,7 @@
( NULL == pEventData->pCBfnc ))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -9750,7 +9750,7 @@
( NULL == pEventData->pCBfnc ))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -9822,7 +9822,7 @@
( NULL == pEventData->pCBfnc))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -9902,7 +9902,7 @@
( NULL == pEventData->pCBfnc ))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -9979,7 +9979,7 @@
( NULL == pEventData->pCBfnc ))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -10056,7 +10056,7 @@
( NULL == pEventData->pCBfnc ))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters ",__FUNCTION__);
+ "%s: Invalid parameters ",__func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -10129,7 +10129,7 @@
( NULL == pEventData->pCBfnc ))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters ",__FUNCTION__);
+ "%s: Invalid parameters ",__func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -10206,7 +10206,7 @@
if (( NULL == pEventData ) || ( NULL == pEventData->pEventData ))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters in Suspend ind",__FUNCTION__);
+ "%s: Invalid parameters in Suspend ind",__func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -10282,7 +10282,7 @@
( NULL == pEventData->pCBfnc ))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -10375,7 +10375,7 @@
( NULL == pEventData->pCBfnc ))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -10527,7 +10527,7 @@
( NULL == pEventData->pCBfnc ))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -10654,7 +10654,7 @@
( NULL == pEventData->pCBfnc ) )
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -10775,7 +10775,7 @@
( NULL == pEventData->pCBfnc))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -10858,7 +10858,7 @@
( NULL == pEventData->pCBfnc ))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -10995,7 +10995,7 @@
( NULL == pEventData->pCBfnc ))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -11139,7 +11139,7 @@
( NULL == pEventData->pCBfnc))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -11241,7 +11241,7 @@
( NULL == pEventData->pCBfnc ))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -11327,7 +11327,7 @@
( NULL == pEventData->pCBfnc))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -11413,7 +11413,7 @@
(WDI_NvDownloadRspCb)pEventData->pCBfnc)))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -11469,7 +11469,7 @@
( NULL == pEventData->pCBfnc ))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_ERROR,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -11555,7 +11555,7 @@
( NULL == pEventData->pCBfnc))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -11692,7 +11692,7 @@
( NULL == (wdiEnterImpsRspCb = (WDI_EnterImpsRspCb)pEventData->pCBfnc)))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -11778,7 +11778,7 @@
( NULL == (wdiExitImpsRspCb = (WDI_ExitImpsRspCb)pEventData->pCBfnc)))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -11841,7 +11841,7 @@
( NULL == (wdiEnterBmpsRspCb = (WDI_EnterBmpsRspCb)pEventData->pCBfnc)))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -11949,7 +11949,7 @@
( NULL == (wdiExitBmpsRspCb = (WDI_ExitBmpsRspCb)pEventData->pCBfnc)))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -12020,7 +12020,7 @@
( NULL == (wdiEnterUapsdRspCb = (WDI_EnterUapsdRspCb)pEventData->pCBfnc)))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -12099,7 +12099,7 @@
( NULL == (wdiExitUapsdRspCb = (WDI_ExitUapsdRspCb)pEventData->pCBfnc)))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -12169,7 +12169,7 @@
( NULL == (wdiSetUapsdAcParamsCb = (WDI_SetUapsdAcParamsCb)pEventData->pCBfnc)))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -12243,7 +12243,7 @@
( NULL == (wdiUpdateUapsdParamsCb = (WDI_UpdateUapsdParamsCb)pEventData->pCBfnc)))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -12312,7 +12312,7 @@
( NULL == (wdiConfigureRxpFilterCb = (WDI_ConfigureRxpFilterCb)pEventData->pCBfnc)))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -12383,7 +12383,7 @@
( NULL == (wdiBeaconFilterCb = (WDI_SetBeaconFilterCb)pEventData->pCBfnc)))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -12453,7 +12453,7 @@
( NULL == (wdiBeaconFilterCb = (WDI_RemBeaconFilterCb)pEventData->pCBfnc)))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -12522,7 +12522,7 @@
( NULL == (wdiRSSIThresholdsCb = (WDI_SetRSSIThresholdsCb)pEventData->pCBfnc)))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -12626,7 +12626,7 @@
( NULL == (wdiHostOffloadCb = (WDI_HostOffloadCb)pEventData->pCBfnc)))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -12653,7 +12653,7 @@
if ( NULL == pBSSSes )
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_ERROR,
- " %s : Association for this BSSID does not exist",__FUNCTION__);
+ " %s : Association for this BSSID does not exist",__func__);
return WDI_STATUS_E_FAILURE;
}
@@ -12798,7 +12798,7 @@
if ( NULL == pBSSSes )
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_ERROR,
- " %s : Association for this BSSID does not exist",__FUNCTION__);
+ " %s : Association for this BSSID does not exist",__func__);
return WDI_STATUS_E_FAILURE;
}
@@ -12880,7 +12880,7 @@
( NULL == (wdiWowlAddBcPtrnCb = (WDI_WowlAddBcPtrnCb)pEventData->pCBfnc)))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -12907,7 +12907,7 @@
if ( NULL == pBSSSes )
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_ERROR,
- " %s : Association for this BSSID does not exist",__FUNCTION__);
+ " %s : Association for this BSSID does not exist",__func__);
return WDI_STATUS_E_FAILURE;
}
@@ -12997,7 +12997,7 @@
( NULL == (wdiWowlDelBcPtrnCb = (WDI_WowlDelBcPtrnCb)pEventData->pCBfnc)))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -13024,7 +13024,7 @@
if ( NULL == pBSSSes )
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_ERROR,
- " %s : Association for this BSSID does not exist",__FUNCTION__);
+ " %s : Association for this BSSID does not exist",__func__);
return WDI_STATUS_E_FAILURE;
}
@@ -13080,7 +13080,7 @@
( NULL == (wdiWowlEnterCb = (WDI_WowlEnterReqCb)pEventData->pCBfnc)))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -13188,7 +13188,7 @@
( NULL == (wdiWowlExitCb = (WDI_WowlExitReqCb)pEventData->pCBfnc)))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -13254,7 +13254,7 @@
( NULL == (wdiConfigureAppsCpuWakeupStateCb = (WDI_ConfigureAppsCpuWakeupStateCb)pEventData->pCBfnc)))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -13330,7 +13330,7 @@
( NULL == pEventData->pCBfnc ))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -13516,7 +13516,7 @@
if ( NULL == pEventData )
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -13607,7 +13607,7 @@
( NULL == wdiStartRspCb ))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -13775,7 +13775,7 @@
( NULL == wdiStopRspCb ))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -13893,7 +13893,7 @@
( NULL == pEventData->pEventData))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -13902,7 +13902,7 @@
if( NULL == wdiInitScanRspCb)
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_FATAL,
- "%s: call back function is NULL", __FUNCTION__);
+ "%s: call back function is NULL", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -13960,7 +13960,7 @@
( NULL == pEventData->pEventData))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -13969,7 +13969,7 @@
if( NULL == wdiStartScanRspCb)
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_FATAL,
- "%s: call back function is NULL", __FUNCTION__);
+ "%s: call back function is NULL", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -14037,7 +14037,7 @@
( NULL == pEventData->pEventData))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -14099,7 +14099,7 @@
( NULL == pEventData->pEventData))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -14168,7 +14168,7 @@
( NULL == pEventData->pEventData))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -14287,7 +14287,7 @@
( NULL == pEventData->pEventData))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -14488,7 +14488,7 @@
( NULL == pEventData->pEventData))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -14587,7 +14587,7 @@
( NULL == pEventData->pEventData))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -14756,7 +14756,7 @@
( NULL == pEventData->pEventData))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -14846,7 +14846,7 @@
( NULL == pEventData->pEventData))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -14903,7 +14903,7 @@
( NULL == pEventData->pEventData))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -14961,7 +14961,7 @@
( NULL == pEventData->pEventData))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -15018,7 +15018,7 @@
( NULL == pEventData->pEventData))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -15075,7 +15075,7 @@
( NULL == pEventData->pEventData))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -15135,7 +15135,7 @@
( NULL == pEventData->pEventData))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -15200,7 +15200,7 @@
( NULL == pEventData->pEventData))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -15249,7 +15249,7 @@
( NULL == pEventData->pEventData))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -15297,7 +15297,7 @@
( NULL == pEventData->pEventData))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -15349,7 +15349,7 @@
( NULL == pEventData->pEventData))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -15412,7 +15412,7 @@
( NULL == pEventData->pEventData))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -15466,7 +15466,7 @@
( NULL == pEventData->pEventData))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_ERROR,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -15533,7 +15533,7 @@
( NULL == pEventData->pEventData))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -15584,7 +15584,7 @@
( NULL == pEventData->pEventData))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -15637,7 +15637,7 @@
( NULL == pEventData->pEventData))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -15738,7 +15738,7 @@
( NULL == pEventData->pEventData))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -15767,7 +15767,7 @@
if(WDI_STATUS_E_FAILURE == wdiStatus)
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_ERROR,
- "%s: Unable to extract the STA Idx ", __FUNCTION__);
+ "%s: Unable to extract the STA Idx ", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -15811,7 +15811,7 @@
( NULL == pEventData->pEventData))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -15885,7 +15885,7 @@
( NULL == pEventData->pEventData))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -15948,7 +15948,7 @@
( NULL == pEventData->pEventData))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -16095,7 +16095,7 @@
( NULL == pEventData->pEventData))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -16209,7 +16209,7 @@
( NULL == pEventData->pEventData))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -16285,7 +16285,7 @@
( NULL == pEventData->pEventData))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -16337,7 +16337,7 @@
( NULL == pEventData->pEventData))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -16399,7 +16399,7 @@
( NULL == pEventData->pEventData))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -16487,7 +16487,7 @@
( NULL == pEventData->pEventData))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -16538,7 +16538,7 @@
( NULL == pEventData->pEventData))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -16590,7 +16590,7 @@
( NULL == pEventData->pEventData))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -16643,7 +16643,7 @@
( NULL == pEventData->pEventData))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -16705,7 +16705,7 @@
( NULL == pEventData->pEventData))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -16756,7 +16756,7 @@
( NULL == pEventData->pEventData))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -16818,7 +16818,7 @@
( NULL == pEventData->pEventData))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -16871,7 +16871,7 @@
( NULL == pEventData->pEventData))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -16950,7 +16950,7 @@
( NULL == pEventData->pEventData))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -17018,7 +17018,7 @@
( NULL == pEventData->pEventData))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -17093,7 +17093,7 @@
( NULL == pEventData->pEventData))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -17161,7 +17161,7 @@
( NULL == pEventData->pEventData))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -17209,7 +17209,7 @@
( NULL == pEventData->pEventData))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -17257,7 +17257,7 @@
( NULL == pEventData->pEventData))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -17305,7 +17305,7 @@
( NULL == pEventData->pEventData))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -17353,7 +17353,7 @@
( NULL == pEventData->pEventData))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -17401,7 +17401,7 @@
( NULL == pEventData->pEventData))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -17449,7 +17449,7 @@
( NULL == pEventData->pEventData))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -17500,7 +17500,7 @@
( NULL == pEventData->pEventData))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -17550,7 +17550,7 @@
( NULL == pEventData->pEventData))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -17612,7 +17612,7 @@
( NULL == pEventData->pEventData))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -17672,7 +17672,7 @@
( NULL == pEventData->pEventData))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -17734,7 +17734,7 @@
( NULL == pEventData->pEventData))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -17795,7 +17795,7 @@
( NULL == pEventData->pEventData))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -17844,7 +17844,7 @@
( NULL == pEventData->pEventData))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -17908,7 +17908,7 @@
( NULL == pEventData->pEventData))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -17961,7 +17961,7 @@
( NULL == pEventData->pEventData))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -18014,7 +18014,7 @@
( NULL == pEventData->pEventData))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -18065,7 +18065,7 @@
( NULL == pEventData->pEventData))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -18129,7 +18129,7 @@
( NULL == pEventData->pEventData))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -18181,7 +18181,7 @@
( NULL == pEventData->pEventData))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -18235,7 +18235,7 @@
( NULL == pEventData->pEventData))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -18302,7 +18302,7 @@
( NULL == pEventData->pEventData))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -18357,7 +18357,7 @@
( NULL == pEventData->pEventData))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -18422,7 +18422,7 @@
( NULL == pEventData->pEventData ))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT( 0 );
return WDI_STATUS_E_FAILURE;
}
@@ -18486,7 +18486,7 @@
( NULL == pEventData->pEventData ))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT( 0 );
return WDI_STATUS_E_FAILURE;
}
@@ -18539,7 +18539,7 @@
( NULL == pEventData->pEventData ))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT( 0 );
return WDI_STATUS_E_FAILURE;
}
@@ -18652,7 +18652,7 @@
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -18708,7 +18708,7 @@
( NULL == pEventData->pEventData))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -18759,7 +18759,7 @@
( NULL == pEventData->pCBfnc ))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -18838,7 +18838,7 @@
( NULL == pEventData->pEventData))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -18911,7 +18911,7 @@
if (NULL == pWDICtx )
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return;
}
@@ -18920,7 +18920,7 @@
{
/* callback presumably occurred after close */
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid control block", __FUNCTION__);
+ "%s: Invalid control block", __func__);
return;
}
@@ -18991,7 +18991,7 @@
( uLen < sizeof(tHalMsgHeader)))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return;
}
@@ -19000,7 +19000,7 @@
{
/* callback presumably occurred after close */
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid control block", __FUNCTION__);
+ "%s: Invalid control block", __func__);
return;
}
@@ -19423,7 +19423,7 @@
if (NULL == pWDICtx )
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return;
}
@@ -19629,7 +19629,7 @@
if (pWDICtx->uGlobalState == WDI_STARTED_ST)
{
WPAL_TRACE(eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_INFO,
- "%s: WDI_NV_DOWNLOAD_REQ called in WDI_STARTED_ST - send with WDI_REQUEST_EVENT", __FUNCTION__);
+ "%s: WDI_NV_DOWNLOAD_REQ called in WDI_STARTED_ST - send with WDI_REQUEST_EVENT", __func__);
wdiStatus = WDI_PostMainEvent(&gWDICb, WDI_REQUEST_EVENT, pEventData);
}
else
@@ -19798,7 +19798,7 @@
if ( NULL == pEventDataQueue )
{
WPAL_TRACE(eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_ERROR,
- "%s: Cannot allocate memory for queue node", __FUNCTION__);
+ "%s: Cannot allocate memory for queue node", __func__);
WDI_ASSERT(0);
return WDI_STATUS_MEM_FAILURE;
}
@@ -19807,7 +19807,7 @@
if ( NULL == pSessionIdElement )
{
WPAL_TRACE(eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_ERROR,
- "%s: Cannot allocate memory for session ID", __FUNCTION__);
+ "%s: Cannot allocate memory for session ID", __func__);
WDI_ASSERT(0);
wpalMemoryFree(pEventDataQueue);
return WDI_STATUS_MEM_FAILURE;
@@ -19817,7 +19817,7 @@
if ( NULL == pEventInfo )
{
WPAL_TRACE(eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_ERROR,
- "%s: Cannot allocate memory for event data info", __FUNCTION__);
+ "%s: Cannot allocate memory for event data info", __func__);
WDI_ASSERT(0);
wpalMemoryFree(pSessionIdElement);
wpalMemoryFree(pEventDataQueue);
@@ -19889,7 +19889,7 @@
if (( NULL == pSession ) || ( NULL == pWDICtx ))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
return WDI_STATUS_E_FAILURE;
}
@@ -19901,7 +19901,7 @@
if ( NULL == pEventDataQueue )
{
WPAL_TRACE(eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_ERROR,
- "%s: Cannot allocate memory for queueing", __FUNCTION__);
+ "%s: Cannot allocate memory for queueing", __func__);
WDI_ASSERT(0);
return WDI_STATUS_MEM_FAILURE;
}
@@ -19911,7 +19911,7 @@
{
WPAL_TRACE(eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_ERROR,
"%s: Cannot allocate memory for queueing event data info",
- __FUNCTION__);
+ __func__);
WDI_ASSERT(0);
wpalMemoryFree(pEventDataQueue);
return WDI_STATUS_MEM_FAILURE;
@@ -19969,7 +19969,7 @@
if ( NULL == pWDICtx )
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
return WDI_STATUS_E_FAILURE;
}
@@ -20143,7 +20143,7 @@
if ( NULL == ppSession )
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
return WDI_MAX_BSS_SESSIONS;
}
@@ -20196,7 +20196,7 @@
if ( NULL == ppSession )
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
return WDI_MAX_BSS_SESSIONS;
}
@@ -20245,7 +20245,7 @@
if ( NULL == ppSession || usIdx >= WDI_MAX_BSS_SESSIONS )
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
return WDI_MAX_BSS_SESSIONS;
}
@@ -20282,7 +20282,7 @@
if ( NULL == ppSession )
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
return WDI_MAX_BSS_SESSIONS;
}
@@ -20362,7 +20362,7 @@
if ( NULL == ppSession )
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
return ;
}
@@ -20407,7 +20407,7 @@
if ( NULL == staParams )
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
return;
}
@@ -22531,7 +22531,7 @@
( NULL == (wdiPNOScanCb = (WDI_PNOScanCb)pEventData->pCBfnc)))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -22542,7 +22542,7 @@
if ( pWDICtx->wdiPNOVersion > 0 )
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_INFO,
- "%s: PNO new version %d ", __FUNCTION__,
+ "%s: PNO new version %d ", __func__,
pWDICtx->wdiPNOVersion);
wdiStatus = WDI_PackPreferredNetworkListNew( pWDICtx, pwdiPNOScanReqParams,
@@ -22551,7 +22551,7 @@
else
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_INFO,
- "%s: PNO old version %d ", __FUNCTION__,
+ "%s: PNO old version %d ", __func__,
pWDICtx->wdiPNOVersion);
wdiStatus = WDI_PackPreferredNetworkList( pWDICtx, pwdiPNOScanReqParams,
@@ -22562,7 +22562,7 @@
( NULL == pSendBuffer )||( 0 == usSendSize ))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: failed to pack request parameters", __FUNCTION__);
+ "%s: failed to pack request parameters", __func__);
WDI_ASSERT(0);
return wdiStatus;
}
@@ -22608,7 +22608,7 @@
( NULL == (wdiRssiFilterCb = (WDI_RssiFilterCb)pEventData->pCBfnc)))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -22677,7 +22677,7 @@
( NULL == (wdiUpdateScanParamsCb = (WDI_UpdateScanParamsCb)pEventData->pCBfnc)))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -22764,7 +22764,7 @@
( NULL == pEventData->pEventData ))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT( 0 );
return WDI_STATUS_E_FAILURE;
}
@@ -22834,7 +22834,7 @@
( NULL == pEventData->pEventData ))
{
WPAL_TRACE(eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -22883,7 +22883,7 @@
( NULL == pEventData->pEventData ))
{
WPAL_TRACE(eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -22932,13 +22932,13 @@
( NULL == pEventData->pEventData ))
{
WPAL_TRACE(eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
WPAL_TRACE(eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_INFO,
- "Process UPD scan params ptr : %x", __FUNCTION__);
+ "Process UPD scan params ptr : %x", __func__);
wdiUpdateScanParamsCb = (WDI_UpdateScanParamsCb)pWDICtx->pfncRspCB;
@@ -22983,7 +22983,7 @@
/*- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
WPAL_TRACE(eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_INFO,
- "%s", __FUNCTION__);
+ "%s", __func__);
/*------------------------------------------------------------------------
Sanity Check
@@ -23020,7 +23020,7 @@
/*- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
WPAL_TRACE(eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_INFO,
- "%s",__FUNCTION__);
+ "%s",__func__);
/*------------------------------------------------------------------------
Sanity Check
@@ -23060,7 +23060,7 @@
/*- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
WPAL_TRACE(eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_INFO,
- "%s",__FUNCTION__);
+ "%s",__func__);
/*------------------------------------------------------------------------
Sanity Check
@@ -23098,7 +23098,7 @@
/*- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
WPAL_TRACE(eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_INFO,
- "%s",__FUNCTION__);
+ "%s",__func__);
/*------------------------------------------------------------------------
Sanity Check
@@ -23151,7 +23151,7 @@
WDI_BSSSessionType* pBSSSes = NULL;
WPAL_TRACE(eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_INFO,
- "%s",__FUNCTION__);
+ "%s",__func__);
pRcvFltMcAddrListType = wpalMemoryAllocate(sizeof(tHalRcvFltMcAddrListType)) ;
if( NULL == pRcvFltMcAddrListType )
@@ -23171,7 +23171,7 @@
(WDI_8023MulticastListCb)pEventData->pCBfnc)))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
wpalMemoryFree(pRcvFltMcAddrListType);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
@@ -23183,7 +23183,7 @@
if ( NULL == pBSSSes )
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_ERROR,
- " %s : Association for this BSSID does not exist",__FUNCTION__);
+ " %s : Association for this BSSID does not exist",__func__);
wpalMemoryFree(pRcvFltMcAddrListType);
return WDI_STATUS_E_FAILURE;
}
@@ -23263,7 +23263,7 @@
wpt_uint32 usSessRcvPktFilterCfgSize;
WPAL_TRACE(eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_INFO,
- "%s",__FUNCTION__);
+ "%s",__func__);
/*-------------------------------------------------------------------------
Sanity check
@@ -23275,7 +23275,7 @@
(WDI_ReceiveFilterSetFilterCb)pEventData->pCBfnc)))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -23286,7 +23286,7 @@
if ( NULL == pBSSSes )
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_ERROR,
- " %s : Association for this BSSID does not exist",__FUNCTION__);
+ " %s : Association for this BSSID does not exist",__func__);
return WDI_STATUS_E_FAILURE;
}
@@ -23305,7 +23305,7 @@
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
"%s: Failed to allocate memory for "
"tHalRcvPktFilterCfgType: %x %x %x ",
- __FUNCTION__, pWDICtx, pEventData, pEventData->pEventData);
+ __func__, pWDICtx, pEventData, pEventData->pEventData);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -23422,7 +23422,7 @@
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
"%s: Failed to allocate memory for "
"tHalRcvPktFilterCfgType: %x %x %x ",
- __FUNCTION__, pWDICtx, pEventData, pEventData->pEventData);
+ __func__, pWDICtx, pEventData, pEventData->pEventData);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -23519,7 +23519,7 @@
pWDICtx->pReqStatusUserData = pwdiSetRcvPktFilterReqInfo->pUserData;
WPAL_TRACE(eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_INFO,
- "%s",__FUNCTION__);
+ "%s",__func__);
wpalMemoryFree(pRcvPktFilterCfg);
}
/*-------------------------------------------------------------------------
@@ -23558,7 +23558,7 @@
WDI_BSSSessionType* pBSSSes = NULL;
WPAL_TRACE(eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_INFO,
- "%s",__FUNCTION__);
+ "%s",__func__);
/*-------------------------------------------------------------------------
Sanity check
@@ -23570,7 +23570,7 @@
(WDI_FilterMatchCountCb)pEventData->pCBfnc)))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -23581,7 +23581,7 @@
if ( NULL == pBSSSes )
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_ERROR,
- " %s : Association for this BSSID does not exist",__FUNCTION__);
+ " %s : Association for this BSSID does not exist",__func__);
return WDI_STATUS_E_FAILURE;
}
@@ -23650,7 +23650,7 @@
WDI_BSSSessionType* pBSSSes = NULL;
WPAL_TRACE(eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_INFO,
- "%s",__FUNCTION__);
+ "%s",__func__);
/*-------------------------------------------------------------------------
Sanity check
@@ -23662,7 +23662,7 @@
(WDI_ReceiveFilterClearFilterCb)pEventData->pCBfnc)))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -23673,7 +23673,7 @@
if ( NULL == pBSSSes )
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_ERROR,
- " %s : Association for this BSSID does not exist",__FUNCTION__);
+ " %s : Association for this BSSID does not exist",__func__);
return WDI_STATUS_E_FAILURE;
}
@@ -23741,7 +23741,7 @@
/*- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
WPAL_TRACE(eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_INFO,
- "%s",__FUNCTION__);
+ "%s",__func__);
/*-------------------------------------------------------------------------
Sanity check
@@ -23750,7 +23750,7 @@
( NULL == pEventData->pEventData ))
{
WPAL_TRACE(eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -23807,7 +23807,7 @@
/*- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
WPAL_TRACE(eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_INFO,
- "%s",__FUNCTION__);
+ "%s",__func__);
/*-------------------------------------------------------------------------
Sanity check
@@ -23816,7 +23816,7 @@
( NULL == pEventData->pEventData ))
{
WPAL_TRACE(eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -23871,7 +23871,7 @@
/*- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
WPAL_TRACE(eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_INFO,
- "%s",__FUNCTION__);
+ "%s",__func__);
/*-------------------------------------------------------------------------
Sanity check
@@ -23880,7 +23880,7 @@
( NULL == pEventData->pEventData ))
{
WPAL_TRACE(eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -23934,7 +23934,7 @@
/*- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
WPAL_TRACE(eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_INFO,
- "%s",__FUNCTION__);
+ "%s",__func__);
/*-------------------------------------------------------------------------
Sanity check
@@ -23943,7 +23943,7 @@
( NULL == pEventData->pEventData ))
{
WPAL_TRACE(eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -24082,7 +24082,7 @@
( NULL == (wdiPowerParamsCb = (WDI_SetPowerParamsCb)pEventData->pCBfnc)))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -24170,7 +24170,7 @@
( NULL == pEventData->pEventData ))
{
WPAL_TRACE(eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -24345,7 +24345,7 @@
( NULL == (wdiGtkOffloadCb = (WDI_GtkOffloadCb)pEventData->pCBfnc)))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -24374,7 +24374,7 @@
if ( NULL == pBSSSes )
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_ERROR,
- " %s : Association for this BSSID does not exist", __FUNCTION__);
+ " %s : Association for this BSSID does not exist", __func__);
return WDI_STATUS_E_FAILURE;
}
@@ -24436,7 +24436,7 @@
( NULL == (wdiGtkOffloadGetInfoCb = (WDI_GtkOffloadGetInfoCb)pEventData->pCBfnc)))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -24461,7 +24461,7 @@
if ( NULL == pBSSSes )
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_ERROR,
- " %s : Association for this BSSID does not exist",__FUNCTION__);
+ " %s : Association for this BSSID does not exist",__func__);
return WDI_STATUS_E_FAILURE;
}
halGtkOffloadGetInfoReqParams.bssIdx = pBSSSes->ucBSSIdx;
@@ -24515,7 +24515,7 @@
( NULL == pEventData->pEventData))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -24578,7 +24578,7 @@
( NULL == pEventData->pEventData ))
{
WPAL_TRACE(eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -24632,7 +24632,7 @@
wpt_uint32 allocSize = 0;
WPAL_TRACE(eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_INFO,
- "+%s", __FUNCTION__);
+ "+%s", __func__);
/*-------------------------------------------------------------------------
Sanity check
@@ -24641,7 +24641,7 @@
( NULL == pEventData->pEventData ))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT( 0 );
return WDI_STATUS_E_FAILURE;
}
@@ -24660,7 +24660,7 @@
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
"%s: Failed to allocate memory for WDI_WakeReasonIndType: %x %x %x ",
- __FUNCTION__, pWDICtx, pEventData, pEventData->pEventData);
+ __func__, pWDICtx, pEventData, pEventData->pEventData);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -24685,7 +24685,7 @@
wpalMemoryFree(pWdiInd);
WPAL_TRACE(eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_INFO,
- "-%s", __FUNCTION__);
+ "-%s", __func__);
return WDI_STATUS_SUCCESS;
}
@@ -24731,7 +24731,7 @@
( NULL == pEventData->pEventData ))
{
WPAL_TRACE(eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -24781,7 +24781,7 @@
( NULL == (wdiSetTmLevelCb = (WDI_SetTmLevelCb)pEventData->pCBfnc)))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -24928,7 +24928,7 @@
/*- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
WPAL_TRACE(eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_INFO,
- "%s", __FUNCTION__);
+ "%s", __func__);
/*-------------------------------------------------------------------------
Sanity check
@@ -24938,7 +24938,7 @@
( NULL == (tWlanFeatCaps *)pEventData->pEventData))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_FATAL,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -25004,7 +25004,7 @@
/*- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
WPAL_TRACE(eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_INFO,
- "%s", __FUNCTION__);
+ "%s", __func__);
/*-------------------------------------------------------------------------
Sanity check
@@ -25014,7 +25014,7 @@
{
/* It will go here when riva is old (doesn't understand this msg) and host is new */
WPAL_TRACE(eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -25078,7 +25078,7 @@
( NULL == pEventData->pEventData))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -25178,7 +25178,7 @@
/*- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
WPAL_TRACE(eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_INFO,
- "%s", __FUNCTION__);
+ "%s", __func__);
/*-------------------------------------------------------------------------
Sanity check
@@ -25188,7 +25188,7 @@
( NULL == (wdiVHTOpModeCb = (WDI_UpdateVHTOpModeCb)pEventData->pCBfnc)))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return WDI_STATUS_E_FAILURE;
}
@@ -25304,7 +25304,7 @@
if (NULL == pWDICtx )
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%s: Invalid parameters", __FUNCTION__);
+ "%s: Invalid parameters", __func__);
WDI_ASSERT(0);
return;
}
diff --git a/CORE/WDI/TRP/CTS/src/wlan_qct_wdi_cts.c b/CORE/WDI/TRP/CTS/src/wlan_qct_wdi_cts.c
index 0e6ca93..1578654 100644
--- a/CORE/WDI/TRP/CTS/src/wlan_qct_wdi_cts.c
+++ b/CORE/WDI/TRP/CTS/src/wlan_qct_wdi_cts.c
@@ -503,7 +503,7 @@
if (WCTS_CB_MAGIC != pWCTSCb->wctsMagic) {
WPAL_TRACE(eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_ERROR,
"%s: Received unexpected SMD event %u",
- __FUNCTION__, event);
+ __func__, event);
/* TODO_PRIMA what error recovery options do we have? */
return;
@@ -513,7 +513,7 @@
switch (event) {
case SMD_EVENT_OPEN:
WPAL_TRACE(eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_INFO,
- "%s: received SMD_EVENT_OPEN from SMD", __FUNCTION__);
+ "%s: received SMD_EVENT_OPEN from SMD", __func__);
/* If the prev state was 'remote closed' then it is a Riva 'restart',
* subsystem restart re-init
*/
@@ -521,7 +521,7 @@
{
WPAL_TRACE(eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_INFO,
"%s: received SMD_EVENT_OPEN in WCTS_STATE_REM_CLOSED state",
- __FUNCTION__);
+ __func__);
/* call subsystem restart re-init function */
wpalDriverReInit();
return;
@@ -534,37 +534,37 @@
{
WPAL_TRACE(eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_ERROR,
"%s: received SMD data when the state is remote closed ",
- __FUNCTION__);
+ __func__);
/* we should not be getting any data now */
return;
}
WPAL_TRACE(eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_INFO,
- "%s: received SMD_EVENT_DATA from SMD", __FUNCTION__);
+ "%s: received SMD_EVENT_DATA from SMD", __func__);
palMsg = &pWCTSCb->wctsDataMsg;
break;
case SMD_EVENT_CLOSE:
WPAL_TRACE(eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_INFO,
- "%s: received SMD_EVENT_CLOSE from SMD", __FUNCTION__);
+ "%s: received SMD_EVENT_CLOSE from SMD", __func__);
/* SMD channel was closed from the remote side,
* this would happen only when Riva crashed and SMD is
* closing the channel on behalf of Riva */
pWCTSCb->wctsState = WCTS_STATE_REM_CLOSED;
WPAL_TRACE(eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_INFO,
"%s: received SMD_EVENT_CLOSE WLAN driver going down now",
- __FUNCTION__);
+ __func__);
/* subsystem restart: shutdown */
wpalDriverShutdown();
return;
case SMD_EVENT_STATUS:
WPAL_TRACE(eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_INFO,
- "%s: received SMD_EVENT_STATUS from SMD", __FUNCTION__);
+ "%s: received SMD_EVENT_STATUS from SMD", __func__);
return;
case SMD_EVENT_REOPEN_READY:
WPAL_TRACE(eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_INFO,
- "%s: received SMD_EVENT_REOPEN_READY from SMD", __FUNCTION__);
+ "%s: received SMD_EVENT_REOPEN_READY from SMD", __func__);
/* unlike other events which occur when our kernel threads are
running, this one is received when the threads are closed and
@@ -575,7 +575,7 @@
default:
WPAL_TRACE(eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_ERROR,
"%s: Unexpected event %u received from SMD",
- __FUNCTION__, event);
+ __func__, event);
return;
}
@@ -731,7 +731,7 @@
if (0 != smdstatus) {
WPAL_TRACE(eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_ERROR,
"%s: smd_named_open_on_edge failed with status %d",
- __FUNCTION__, smdstatus);
+ __func__, smdstatus);
goto fail;
}
@@ -740,13 +740,13 @@
if (eWLAN_PAL_STATUS_SUCCESS != status) {
WPAL_TRACE(eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_ERROR,
"%s: failed to receive SMD_EVENT_OPEN",
- __FUNCTION__);
+ __func__);
/* since we opened one end of the channel, close it */
smdstatus = smd_close(pWCTSCb->wctsChannel);
if (0 != smdstatus) {
WPAL_TRACE(eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_ERROR,
"%s: smd_close failed with status %d",
- __FUNCTION__, smdstatus);
+ __func__, smdstatus);
}
goto fail;
}
@@ -832,7 +832,7 @@
if (0 != smdstatus) {
WPAL_TRACE(eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_ERROR,
"%s: smd_close failed with status %d",
- __FUNCTION__, smdstatus);
+ __func__, smdstatus);
/* SMD did not successfully close the channel, therefore we
won't receive an asynchronous close notification so don't
bother to wait for an event that won't come */
@@ -843,7 +843,7 @@
if (eWLAN_PAL_STATUS_SUCCESS != status) {
WPAL_TRACE(eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_ERROR,
"%s: failed to receive SMD_EVENT_REOPEN_READY",
- __FUNCTION__);
+ __func__);
}
/* During the close sequence we deregistered from SMD. As part
diff --git a/CORE/WDI/TRP/DTS/src/wlan_qct_wdi_dts.c b/CORE/WDI/TRP/DTS/src/wlan_qct_wdi_dts.c
index 9e388d8..2c2b4f4 100644
--- a/CORE/WDI/TRP/DTS/src/wlan_qct_wdi_dts.c
+++ b/CORE/WDI/TRP/DTS/src/wlan_qct_wdi_dts.c
@@ -427,7 +427,7 @@
pDTDriverContext = gTransportDriver.open();
if( NULL == pDTDriverContext )
{
- DTI_TRACE( DTI_TRACE_LEVEL_ERROR, " %s fail from transport open", __FUNCTION__);
+ DTI_TRACE( DTI_TRACE_LEVEL_ERROR, " %s fail from transport open", __func__);
return eWLAN_PAL_STATUS_E_FAILURE;
}
WDT_AssignTransportDriverContext(pContext, pDTDriverContext);
diff --git a/CORE/WDI/WPAL/inc/wlan_qct_os_trace.h b/CORE/WDI/WPAL/inc/wlan_qct_os_trace.h
index 67f855a..dbad7fd 100644
--- a/CORE/WDI/WPAL/inc/wlan_qct_os_trace.h
+++ b/CORE/WDI/WPAL/inc/wlan_qct_os_trace.h
@@ -82,7 +82,7 @@
#define WPAL_ASSERT( _condition ) \
if ( ! ( _condition ) ) \
{ \
- printk(KERN_CRIT "VOS ASSERT in %s Line %d\n", __FUNCTION__, __LINE__); \
+ printk(KERN_CRIT "VOS ASSERT in %s Line %d\n", __func__, __LINE__); \
WARN_ON(1); \
}
diff --git a/CORE/WDI/WPAL/src/wlan_qct_pal_api.c b/CORE/WDI/WPAL/src/wlan_qct_pal_api.c
index 18efd4e..b57ee61 100644
--- a/CORE/WDI/WPAL/src/wlan_qct_pal_api.c
+++ b/CORE/WDI/WPAL/src/wlan_qct_pal_api.c
@@ -95,7 +95,7 @@
{
WPAL_TRACE(eWLAN_MODULE_PAL, eWLAN_PAL_TRACE_LEVEL_FATAL,
"%s: wpalDeviceInit failed with status %u",
- __FUNCTION__, status);
+ __func__, status);
}
return status;
@@ -214,7 +214,7 @@
if ( NULL == pv )
{
WPAL_TRACE(eWLAN_MODULE_PAL, eWLAN_PAL_TRACE_LEVEL_ERROR,
- "%s Unable to allocate DMA buffer\n", __FUNCTION__);
+ "%s Unable to allocate DMA buffer\n", __func__);
return NULL;
}
@@ -368,7 +368,7 @@
{
WPAL_TRACE(eWLAN_MODULE_PAL, eWLAN_PAL_TRACE_LEVEL_FATAL,
"%s: loading/unloading in progress,"
- " SSR will be done at the end of unload", __FUNCTION__);
+ " SSR will be done at the end of unload", __func__);
return eWLAN_PAL_STATUS_E_FAILURE;
}
if (0 == subsystem_restart("wcnss"))
diff --git a/CORE/WDI/WPAL/src/wlan_qct_pal_device.c b/CORE/WDI/WPAL/src/wlan_qct_pal_device.c
index 168b968..1e86175 100644
--- a/CORE/WDI/WPAL/src/wlan_qct_pal_device.c
+++ b/CORE/WDI/WPAL/src/wlan_qct_pal_device.c
@@ -191,14 +191,14 @@
if (NULL == gpEnv) {
WPAL_TRACE(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_ERROR,
"%s: invoked before subsystem initialized",
- __FUNCTION__);
+ __func__);
return eWLAN_PAL_STATUS_E_INVAL;
}
if (NULL == callbackFunction) {
WPAL_TRACE(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_ERROR,
"%s: invoked with NULL callback",
- __FUNCTION__);
+ __func__);
return eWLAN_PAL_STATUS_E_INVAL;
}
@@ -209,7 +209,7 @@
/* TX complete handler already registered */
WPAL_TRACE(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_WARN,
"%s: TX interrupt handler already registered",
- __FUNCTION__);
+ __func__);
/* fall though and accept the new values */
}
gpEnv->tx_isr = callbackFunction;
@@ -221,7 +221,7 @@
/* RX complete handler already registered */
WPAL_TRACE(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_WARN,
"%s: RX interrupt handler already registered",
- __FUNCTION__);
+ __func__);
/* fall though and accept the new values */
}
gpEnv->rx_isr = callbackFunction;
@@ -231,7 +231,7 @@
default:
WPAL_TRACE(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_ERROR,
"%s: Unknown interrupt type [%u]",
- __FUNCTION__, intType);
+ __func__, intType);
return eWLAN_PAL_STATUS_E_INVAL;
}
@@ -257,7 +257,7 @@
if (NULL == gpEnv) {
WPAL_TRACE(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_ERROR,
"%s: invoked before subsystem initialized",
- __FUNCTION__);
+ __func__);
return;
}
@@ -288,7 +288,7 @@
default:
WPAL_TRACE(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_ERROR,
"%s: Unknown interrupt type [%u]",
- __FUNCTION__, intType);
+ __func__, intType);
return;
}
@@ -328,7 +328,7 @@
if (ret) {
WPAL_TRACE(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_ERROR,
"%s: RX IRQ request failure",
- __FUNCTION__);
+ __func__);
break;
}
@@ -337,7 +337,7 @@
if (ret) {
WPAL_TRACE(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_ERROR,
"%s: enable_irq_wake failed for RX IRQ",
- __FUNCTION__);
+ __func__);
/* not fatal -- keep on going */
}
}
@@ -355,7 +355,7 @@
if (ret) {
WPAL_TRACE(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_ERROR,
"%s: TX IRQ request failure",
- __FUNCTION__);
+ __func__);
break;
}
@@ -364,7 +364,7 @@
if (ret) {
WPAL_TRACE(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_ERROR,
"%s: enable_irq_wake failed for TX IRQ",
- __FUNCTION__);
+ __func__);
/* not fatal -- keep on going */
}
}
@@ -376,7 +376,7 @@
default:
WPAL_TRACE(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_ERROR,
"%s: unknown interrupt: %d",
- __FUNCTION__, (int)intType);
+ __func__, (int)intType);
break;
}
/* on the integrated platform there is no platform-specific
@@ -415,7 +415,7 @@
default:
WPAL_TRACE(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_ERROR,
"%s: unknown interrupt: %d",
- __FUNCTION__, (int)intType);
+ __func__, (int)intType);
break;
}
@@ -442,7 +442,7 @@
if (NULL == gpEnv) {
WPAL_TRACE(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_ERROR,
"%s: invoked before subsystem initialized",
- __FUNCTION__);
+ __func__);
return eWLAN_PAL_STATUS_E_INVAL;
}
@@ -450,7 +450,7 @@
(address > gpEnv->wcnss_memory->end)) {
WPAL_TRACE(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_ERROR,
"%s: Register address 0x%0x out of range 0x%0x - 0x%0x",
- __FUNCTION__, address,
+ __func__, address,
gpEnv->wcnss_memory->start, gpEnv->wcnss_memory->end);
return eWLAN_PAL_STATUS_E_INVAL;
}
@@ -458,7 +458,7 @@
if (0 != (address & 0x3)) {
WPAL_TRACE(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_ERROR,
"%s: Register address 0x%0x is not word aligned",
- __FUNCTION__, address);
+ __func__, address);
return eWLAN_PAL_STATUS_E_INVAL;
}
@@ -486,7 +486,7 @@
if (NULL == gpEnv) {
WPAL_TRACE(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_ERROR,
"%s: invoked before subsystem initialized",
- __FUNCTION__);
+ __func__);
return eWLAN_PAL_STATUS_E_INVAL;
}
@@ -494,7 +494,7 @@
(address > gpEnv->wcnss_memory->end)) {
WPAL_TRACE(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_ERROR,
"%s: Register address 0x%0x out of range 0x%0x - 0x%0x",
- __FUNCTION__, address,
+ __func__, address,
gpEnv->wcnss_memory->start, gpEnv->wcnss_memory->end);
return eWLAN_PAL_STATUS_E_INVAL;
}
@@ -502,7 +502,7 @@
if (0 != (address & 0x3)) {
WPAL_TRACE(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_ERROR,
"%s: Register address 0x%0x is not word aligned",
- __FUNCTION__, address);
+ __func__, address);
return eWLAN_PAL_STATUS_E_INVAL;
}
@@ -533,7 +533,7 @@
if (NULL == gpEnv) {
WPAL_TRACE(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_ERROR,
"%s: invoked before subsystem initialized",
- __FUNCTION__);
+ __func__);
return eWLAN_PAL_STATUS_E_INVAL;
}
@@ -541,7 +541,7 @@
((address + len) > gpEnv->wcnss_memory->end)) {
WPAL_TRACE(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_ERROR,
"%s: Memory address 0x%0x len %d out of range 0x%0x - 0x%0x",
- __FUNCTION__, address, len,
+ __func__, address, len,
gpEnv->wcnss_memory->start, gpEnv->wcnss_memory->end);
return eWLAN_PAL_STATUS_E_INVAL;
}
@@ -573,7 +573,7 @@
if (NULL == gpEnv) {
WPAL_TRACE(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_ERROR,
"%s: invoked before subsystem initialized",
- __FUNCTION__);
+ __func__);
return eWLAN_PAL_STATUS_E_INVAL;
}
@@ -581,7 +581,7 @@
((address + len) > gpEnv->wcnss_memory->end)) {
WPAL_TRACE(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_ERROR,
"%s: Memory address 0x%0x len %d out of range 0x%0x - 0x%0x",
- __FUNCTION__, address, len,
+ __func__, address, len,
gpEnv->wcnss_memory->start, gpEnv->wcnss_memory->end);
return eWLAN_PAL_STATUS_E_INVAL;
}
@@ -616,14 +616,14 @@
if (NULL != gpEnv) {
WPAL_TRACE(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_ERROR,
"%s: invoked after subsystem initialized",
- __FUNCTION__);
+ __func__);
return eWLAN_PAL_STATUS_E_INVAL;
}
if (NULL == wcnss_device) {
WPAL_TRACE(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_ERROR,
"%s: invalid device",
- __FUNCTION__);
+ __func__);
return eWLAN_PAL_STATUS_E_INVAL;
}
@@ -631,7 +631,7 @@
if (NULL == wcnss_memory) {
WPAL_TRACE(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_ERROR,
"%s: WCNSS memory map unavailable",
- __FUNCTION__);
+ __func__);
return eWLAN_PAL_STATUS_E_FAILURE;
}
@@ -639,7 +639,7 @@
if (0 > tx_irq) {
WPAL_TRACE(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_ERROR,
"%s: WCNSS TX IRQ unavailable",
- __FUNCTION__);
+ __func__);
return eWLAN_PAL_STATUS_E_FAILURE;
}
@@ -647,7 +647,7 @@
if (0 > rx_irq) {
WPAL_TRACE(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_ERROR,
"%s: WCNSS RX IRQ unavailable",
- __FUNCTION__);
+ __func__);
return eWLAN_PAL_STATUS_E_FAILURE;
}
@@ -655,7 +655,7 @@
if (NULL == gpEnv) {
WPAL_TRACE(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_ERROR,
"%s: memory allocation failure",
- __FUNCTION__);
+ __func__);
return eWLAN_PAL_STATUS_E_NOMEM;
}
@@ -674,7 +674,7 @@
if (NULL == gpEnv->mmio) {
WPAL_TRACE(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_ERROR,
"%s: memory remap failure",
- __FUNCTION__);
+ __func__);
goto err_ioremap;
}
@@ -711,7 +711,7 @@
if (NULL == gpEnv) {
WPAL_TRACE(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_ERROR,
"%s: invoked before subsystem initialized",
- __FUNCTION__);
+ __func__);
return eWLAN_PAL_STATUS_E_INVAL;
}
@@ -752,7 +752,7 @@
{
WPAL_TRACE(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_ERROR,
"%s: smsm_change_state failed",
- __FUNCTION__);
+ __func__);
return eWLAN_PAL_STATUS_E_FAILURE;
}
return eWLAN_PAL_STATUS_SUCCESS;
diff --git a/CORE/WDI/WPAL/src/wlan_qct_pal_msg.c b/CORE/WDI/WPAL/src/wlan_qct_pal_msg.c
index 999ac2e..eda8817 100644
--- a/CORE/WDI/WPAL/src/wlan_qct_pal_msg.c
+++ b/CORE/WDI/WPAL/src/wlan_qct_pal_msg.c
@@ -54,7 +54,7 @@
if (NULL == pMsg)
{
WPAL_TRACE(eWLAN_MODULE_PAL, eWLAN_PAL_TRACE_LEVEL_ERROR,
- "%s: NULL message pointer", __FUNCTION__);
+ "%s: NULL message pointer", __func__);
WPAL_ASSERT(0);
return status;
}
@@ -70,7 +70,7 @@
else
{
WPAL_TRACE(eWLAN_MODULE_PAL, eWLAN_PAL_TRACE_LEVEL_ERROR, "%s fail to post msg %d\n",
- __FUNCTION__, pMsg->type);
+ __func__, pMsg->type);
}
return status;
@@ -92,7 +92,7 @@
if (NULL == pMsg)
{
WPAL_TRACE(eWLAN_MODULE_PAL, eWLAN_PAL_TRACE_LEVEL_ERROR,
- "%s: NULL message pointer", __FUNCTION__);
+ "%s: NULL message pointer", __func__);
WPAL_ASSERT(0);
return status;
}
@@ -108,7 +108,7 @@
else
{
WPAL_TRACE(eWLAN_MODULE_PAL, eWLAN_PAL_TRACE_LEVEL_ERROR, "%s fail to post msg %d\n",
- __FUNCTION__, pMsg->type);
+ __func__, pMsg->type);
}
return status;
@@ -129,7 +129,7 @@
if (NULL == pMsg)
{
WPAL_TRACE(eWLAN_MODULE_PAL, eWLAN_PAL_TRACE_LEVEL_ERROR,
- "%s: NULL message pointer", __FUNCTION__);
+ "%s: NULL message pointer", __func__);
WPAL_ASSERT(0);
return status;
}
@@ -145,7 +145,7 @@
else
{
WPAL_TRACE(eWLAN_MODULE_PAL, eWLAN_PAL_TRACE_LEVEL_ERROR, "%s fail to post msg %d\n",
- __FUNCTION__, pMsg->type);
+ __func__, pMsg->type);
}
return status;
diff --git a/CORE/WDI/WPAL/src/wlan_qct_pal_packet.c b/CORE/WDI/WPAL/src/wlan_qct_pal_packet.c
index 019b5a7..100e178 100644
--- a/CORE/WDI/WPAL/src/wlan_qct_pal_packet.c
+++ b/CORE/WDI/WPAL/src/wlan_qct_pal_packet.c
@@ -222,7 +222,7 @@
if (unlikely(NULL == pPkt))
{
WPAL_TRACE(eWLAN_MODULE_PAL, eWLAN_PAL_TRACE_LEVEL_ERROR,
- "%s : NULL packet pointer", __FUNCTION__);
+ "%s : NULL packet pointer", __func__);
return eWLAN_PAL_STATUS_E_INVAL;
}
@@ -238,7 +238,7 @@
else
{
WPAL_TRACE(eWLAN_MODULE_PAL, eWLAN_PAL_TRACE_LEVEL_ERROR, "%s failed\n",
- __FUNCTION__);
+ __func__);
}
return ((wpt_uint32)len);
@@ -264,7 +264,7 @@
if (unlikely(NULL == pPkt))
{
WPAL_TRACE(eWLAN_MODULE_PAL, eWLAN_PAL_TRACE_LEVEL_ERROR,
- "%s : NULL packet pointer", __FUNCTION__);
+ "%s : NULL packet pointer", __func__);
return eWLAN_PAL_STATUS_E_INVAL;
}
@@ -274,7 +274,7 @@
if( !VOS_IS_STATUS_SUCCESS(vos_pkt_trim_head(WPAL_TO_VOS_PKT(pPkt), (v_SIZE_t)size)) )
{
WPAL_TRACE(eWLAN_MODULE_PAL, eWLAN_PAL_TRACE_LEVEL_ERROR, "%s Invalid trim(%d)\n",
- __FUNCTION__, size);
+ __func__, size);
status = eWLAN_PAL_STATUS_E_INVAL;
}
@@ -297,7 +297,7 @@
if (unlikely(NULL == pPkt))
{
WPAL_TRACE(eWLAN_MODULE_PAL, eWLAN_PAL_TRACE_LEVEL_ERROR,
- "%s : NULL packet pointer", __FUNCTION__);
+ "%s : NULL packet pointer", __func__);
return eWLAN_PAL_STATUS_E_INVAL;
}
@@ -306,7 +306,7 @@
if( !VOS_IS_STATUS_SUCCESS(vos_pkt_trim_tail(WPAL_TO_VOS_PKT(pPkt), (v_SIZE_t)size)) )
{
WPAL_TRACE(eWLAN_MODULE_PAL, eWLAN_PAL_TRACE_LEVEL_ERROR, "%s Invalid trim(%d)\n",
- __FUNCTION__, size);
+ __func__, size);
status = eWLAN_PAL_STATUS_E_INVAL;
}
@@ -332,7 +332,7 @@
if (unlikely(NULL == pPkt))
{
WPAL_TRACE(eWLAN_MODULE_PAL, eWLAN_PAL_TRACE_LEVEL_ERROR,
- "%s : NULL packet pointer", __FUNCTION__);
+ "%s : NULL packet pointer", __func__);
return NULL;
}
@@ -364,7 +364,7 @@
if (unlikely(NULL == pPkt))
{
WPAL_TRACE(eWLAN_MODULE_PAL, eWLAN_PAL_TRACE_LEVEL_ERROR,
- "%s : NULL packet pointer", __FUNCTION__);
+ "%s : NULL packet pointer", __func__);
return eWLAN_PAL_STATUS_E_INVAL;
}
@@ -372,7 +372,7 @@
if( (eWLAN_PAL_PKT_TYPE_RX_RAW != WPAL_PACKET_GET_TYPE(pPkt)))
{
WPAL_TRACE(eWLAN_MODULE_PAL, eWLAN_PAL_TRACE_LEVEL_ERROR,
- "%s Invalid packet type(%d)\n", __FUNCTION__,
+ "%s Invalid packet type(%d)\n", __func__,
WPAL_PACKET_GET_TYPE(pPkt));
return eWLAN_PAL_STATUS_E_INVAL;
}
@@ -465,7 +465,7 @@
if (unlikely((NULL == pPacket)||(NULL==pIter)))
{
WPAL_TRACE(eWLAN_MODULE_PAL, eWLAN_PAL_TRACE_LEVEL_ERROR,
- "%s : NULL input pointers %x %x", __FUNCTION__, pPacket, pIter);
+ "%s : NULL input pointers %x %x", __func__, pPacket, pIter);
return eWLAN_PAL_STATUS_E_INVAL;
}
@@ -473,7 +473,7 @@
if (unlikely(NULL == pPktInfo))
{
WPAL_TRACE(eWLAN_MODULE_PAL, eWLAN_PAL_TRACE_LEVEL_ERROR,
- "%s : Invalid Packet Info", __FUNCTION__);
+ "%s : Invalid Packet Info", __func__);
return eWLAN_PAL_STATUS_E_INVAL;
}
@@ -493,7 +493,7 @@
if (unlikely(NULL == pCurInfo))
{
WPAL_TRACE(eWLAN_MODULE_PAL, eWLAN_PAL_TRACE_LEVEL_ERROR,
- "%s : Failed to allocate memory ", __FUNCTION__);
+ "%s : Failed to allocate memory ", __func__);
return eWLAN_PAL_STATUS_E_INVAL;
}
@@ -533,7 +533,7 @@
( NULL == ppAddr ) || ( NULL == pLen )))
{
WPAL_TRACE(eWLAN_MODULE_PAL, eWLAN_PAL_TRACE_LEVEL_ERROR,
- "%s Invalid input parameters \n", __FUNCTION__ );
+ "%s Invalid input parameters \n", __func__ );
return eWLAN_PAL_STATUS_E_INVAL;
}
@@ -593,7 +593,7 @@
if (unlikely(NULL == pPacket))
{
WPAL_TRACE(eWLAN_MODULE_PAL, eWLAN_PAL_TRACE_LEVEL_ERROR,
- "%s : NULL input pointer", __FUNCTION__);
+ "%s : NULL input pointer", __func__);
return eWLAN_PAL_STATUS_E_INVAL;
}
@@ -632,7 +632,7 @@
default:
{
WPAL_TRACE(eWLAN_MODULE_PAL, eWLAN_PAL_TRACE_LEVEL_ERROR,
- " WLAN_PAL: %s: Invalid packet type %d!", __FUNCTION__,
+ " WLAN_PAL: %s: Invalid packet type %d!", __func__,
WPAL_PACKET_GET_TYPE(pPacket) );
WPAL_ASSERT(0);
return eWLAN_PAL_STATUS_E_FAILURE;
@@ -649,7 +649,7 @@
if (unlikely(NULL == pInfo))
{
WPAL_TRACE(eWLAN_MODULE_PAL, eWLAN_PAL_TRACE_LEVEL_ERROR,
- "%s : Failed to allocate memory ", __FUNCTION__);
+ "%s : Failed to allocate memory ", __func__);
return eWLAN_PAL_STATUS_E_INVAL;
}
@@ -678,7 +678,7 @@
if (unlikely(NULL == pPacket))
{
WPAL_TRACE(eWLAN_MODULE_PAL, eWLAN_PAL_TRACE_LEVEL_ERROR,
- "%s : NULL input pointer pPacket", __FUNCTION__);
+ "%s : NULL input pointer pPacket", __func__);
return eWLAN_PAL_STATUS_E_INVAL;
}
@@ -688,7 +688,7 @@
if (unlikely(NULL == pInfo))
{
WPAL_TRACE(eWLAN_MODULE_PAL, eWLAN_PAL_TRACE_LEVEL_FATAL,
- "%s : NULL input pointer pInfo", __FUNCTION__);
+ "%s : NULL input pointer pInfo", __func__);
return eWLAN_PAL_STATUS_E_INVAL;
}
@@ -727,7 +727,7 @@
default:
{
WPAL_TRACE(eWLAN_MODULE_PAL, eWLAN_PAL_TRACE_LEVEL_ERROR,
- " WLAN_PAL: %s: Invalid packet type %d!", __FUNCTION__,
+ " WLAN_PAL: %s: Invalid packet type %d!", __func__,
WPAL_PACKET_GET_TYPE(pPacket) );
WPAL_ASSERT(0);
return eWLAN_PAL_STATUS_E_FAILURE;
@@ -758,7 +758,7 @@
if (NULL == pPacket)
{
WPAL_TRACE(eWLAN_MODULE_PAL, eWLAN_PAL_TRACE_LEVEL_ERROR,
- "%s : NULL input pointer", __FUNCTION__);
+ "%s : NULL input pointer", __func__);
return eWLAN_PAL_STATUS_E_INVAL;
}
diff --git a/CORE/WDI/WPAL/src/wlan_qct_pal_timer.c b/CORE/WDI/WPAL/src/wlan_qct_pal_timer.c
index de7a3c3..f39544f 100644
--- a/CORE/WDI/WPAL/src/wlan_qct_pal_timer.c
+++ b/CORE/WDI/WPAL/src/wlan_qct_pal_timer.c
@@ -56,7 +56,7 @@
else
{
WPAL_TRACE( eWLAN_MODULE_PAL, eWLAN_PAL_TRACE_LEVEL_WARN, " %s pTimer(%d) callback after deleted \n",
- __FUNCTION__, (wpt_uint32)pTimer );
+ __func__, (wpt_uint32)pTimer );
}
}/*wpalTimerCback*/
@@ -75,7 +75,7 @@
if( pTimer == NULL || callback == NULL )
{
WPAL_TRACE( eWLAN_MODULE_PAL, eWLAN_PAL_TRACE_LEVEL_ERROR, " %s Wrong param pTimer(%d) callback(%d)\n",
- __FUNCTION__, (wpt_uint32)pTimer, (wpt_uint32)callback );
+ __func__, (wpt_uint32)pTimer, (wpt_uint32)callback );
return eWLAN_PAL_STATUS_E_INVAL;
}
@@ -106,7 +106,7 @@
if( pTimer == NULL )
{
WPAL_TRACE( eWLAN_MODULE_PAL, eWLAN_PAL_TRACE_LEVEL_ERROR, " %s Wrong param pTimer(%d)\n",
- __FUNCTION__, (wpt_uint32)pTimer );
+ __func__, (wpt_uint32)pTimer );
return eWLAN_PAL_STATUS_E_INVAL;
}
@@ -137,7 +137,7 @@
if( pTimer == NULL )
{
WPAL_TRACE( eWLAN_MODULE_PAL, eWLAN_PAL_TRACE_LEVEL_ERROR, " %s Wrong param pTimer(%d)\n",
- __FUNCTION__, (wpt_uint32)pTimer );
+ __func__, (wpt_uint32)pTimer );
return eWLAN_PAL_STATUS_E_INVAL;
}
return ( WPAL_VOS_TO_WPAL_STATUS( vos_timer_start( &pTimer->timer.timerObj,
@@ -160,7 +160,7 @@
if( pTimer == NULL )
{
WPAL_TRACE( eWLAN_MODULE_PAL, eWLAN_PAL_TRACE_LEVEL_ERROR, " %s Wrong param pTimer(%d)\n",
- __FUNCTION__, (wpt_uint32)pTimer );
+ __func__, (wpt_uint32)pTimer );
return eWLAN_PAL_STATUS_E_INVAL;
}
return (WPAL_VOS_TO_WPAL_STATUS( vos_timer_stop( &pTimer->timer.timerObj )));
diff --git a/CORE/WDI/WPAL/src/wlan_qct_pal_trace.c b/CORE/WDI/WPAL/src/wlan_qct_pal_trace.c
index a37774d..1f74e3d 100644
--- a/CORE/WDI/WPAL/src/wlan_qct_pal_trace.c
+++ b/CORE/WDI/WPAL/src/wlan_qct_pal_trace.c
@@ -97,7 +97,7 @@
switch(level)
{
default:
- printk(KERN_CRIT "%s: Unknown trace level passed in!\n", __FUNCTION__);
+ printk(KERN_CRIT "%s: Unknown trace level passed in!\n", __func__);
// fall thru and use FATAL
case eWLAN_PAL_TRACE_LEVEL_FATAL: