wlan: Modify SAP log for connect/Disconnect.
As a part of logging improvement, modify redundant
logs, change certain log levels in STA connect/
disconnect path to make logs more useful.
Change-Id: I030f50cea88a7580cebbeafaccf7cd13787f653b
CRs-Fixed: 860526
diff --git a/CORE/HDD/src/wlan_hdd_p2p.c b/CORE/HDD/src/wlan_hdd_p2p.c
index a4448a9..4ba1f3a 100644
--- a/CORE/HDD/src/wlan_hdd_p2p.c
+++ b/CORE/HDD/src/wlan_hdd_p2p.c
@@ -2193,8 +2193,8 @@
VOS_STATUS status;
hdd_remain_on_chan_ctx_t* pRemainChanCtx = NULL;
- hddLog(VOS_TRACE_LEVEL_INFO, "%s: Frame Type = %d Frame Length = %d",
- __func__, frameType, nFrameLength);
+ hddLog(VOS_TRACE_LEVEL_INFO, FL("Frame Type = %d Frame Length = %d"),
+ frameType, nFrameLength);
if (NULL == pAdapter)
{
diff --git a/CORE/MAC/src/pe/lim/limProcessProbeReqFrame.c b/CORE/MAC/src/pe/lim/limProcessProbeReqFrame.c
index 3ae9356..f1cd362 100644
--- a/CORE/MAC/src/pe/lim/limProcessProbeReqFrame.c
+++ b/CORE/MAC/src/pe/lim/limProcessProbeReqFrame.c
@@ -664,7 +664,7 @@
limIndicateProbeReqToHDD(tpAniSirGlobal pMac, tANI_U8 *pBd,
tpPESession psessionEntry)
{
- limLog( pMac, LOG1, "Received a probe request frame");
+ limLog( pMac, LOG1, FL("Received a probe request frame"));
//send the probe req to SME.
limSendSmeMgmtFrameInd( pMac, psessionEntry->smeSessionId, pBd,
diff --git a/CORE/SAP/src/sapApiLinkCntl.c b/CORE/SAP/src/sapApiLinkCntl.c
index c3caaf5..793fffa 100644
--- a/CORE/SAP/src/sapApiLinkCntl.c
+++ b/CORE/SAP/src/sapApiLinkCntl.c
@@ -1140,13 +1140,18 @@
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", __func__, roamStatus);
+ VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
+ FL("Before switch on roamStatus = %d"),
+ roamStatus);
switch(roamStatus)
{
case eCSR_ROAM_SESSION_OPENED:
{
/* tHalHandle */
tHalHandle hHal = VOS_GET_HAL_CB(sapContext->pvosGCtx);
+ VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
+ FL("CSR roamStatus = %s (%d)"),
+ "eCSR_ROAM_SESSION_OPENED", roamStatus);
if (NULL == hHal)
{
@@ -1167,8 +1172,9 @@
}
case eCSR_ROAM_INFRA_IND:
- VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, CSR roamStatus = %s (%d)\n",
- __func__, "eCSR_ROAM_INFRA_IND", roamStatus);
+ VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
+ FL("CSR roamStatus = %s (%d)"),
+ "eCSR_ROAM_INFRA_IND", roamStatus);
if(roamResult == eCSR_ROAM_RESULT_INFRA_START_FAILED)
{
/* Fill in the event structure */
@@ -1187,18 +1193,21 @@
break;
case eCSR_ROAM_LOSTLINK:
- VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, CSR roamStatus = %s (%d)\n",
- __func__, "eCSR_ROAM_LOSTLINK", roamStatus);
+ VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
+ FL("CSR roamStatus = %s (%d)"),
+ "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",
- __func__, "eCSR_ROAM_MIC_ERROR_IND", roamStatus);
+ VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
+ FL("CSR roamStatus = %s (%d)"),
+ "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",
- __func__, "eCSR_ROAM_SET_KEY_COMPLETE", roamStatus);
+ VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
+ FL("CSR roamStatus = %s (%d)"),
+ "eCSR_ROAM_SET_KEY_COMPLETE", roamStatus);
if (roamResult == eCSR_ROAM_RESULT_FAILURE )
{
/* Format the SET KEY complete information pass to HDD... */
@@ -1207,8 +1216,9 @@
break;
case eCSR_ROAM_REMOVE_KEY_COMPLETE:
- VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, CSR roamStatus = %s (%d)\n",
- __func__, "eCSR_ROAM_REMOVE_KEY_COMPLETE", roamStatus);
+ VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
+ FL("CSR roamStatus = %s (%d)"),
+ "eCSR_ROAM_REMOVE_KEY_COMPLETE", roamStatus);
if (roamResult == eCSR_ROAM_RESULT_FAILURE )
{
/* Format the SET KEY complete information pass to HDD... */
@@ -1217,8 +1227,9 @@
break;
case eCSR_ROAM_ASSOCIATION_COMPLETION:
- VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, CSR roamStatus = %s (%d)\n",
- __func__, "eCSR_ROAM_ASSOCIATION_COMPLETION", roamStatus);
+ VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
+ FL("CSR roamStatus = %s (%d)"),
+ "eCSR_ROAM_ASSOCIATION_COMPLETION", roamStatus);
if (roamResult == eCSR_ROAM_RESULT_FAILURE )
{
/* Format the SET KEY complete information pass to HDD... */
@@ -1227,8 +1238,9 @@
break;
case eCSR_ROAM_DISASSOCIATED:
- VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, CSR roamStatus = %s (%d)\n",
- __func__, "eCSR_ROAM_DISASSOCIATED", roamStatus);
+ VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
+ FL("CSR roamStatus = %s (%d)"),
+ "eCSR_ROAM_DISASSOCIATED", roamStatus);
if (roamResult == eCSR_ROAM_RESULT_MIC_FAILURE)
{
/* Format the MIC failure event to return... */
@@ -1237,21 +1249,31 @@
break;
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",
- __func__, "eCSR_ROAM_WPS_PBC_PROBE_REQ_IND", roamStatus);
+ VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
+ FL("CSR roamStatus = %s (%d)"),
+ "eCSR_ROAM_WPS_PBC_PROBE_REQ_IND", roamStatus);
break;
case eCSR_ROAM_INDICATE_MGMT_FRAME:
+ VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
+ FL("CSR roamStatus = %s (%d)"),
+ "eCSR_ROAM_INDICATE_MGMT_FRAME", roamStatus);
sapSignalHDDevent(sapContext, pCsrRoamInfo,
eSAP_INDICATE_MGMT_FRAME,
(v_PVOID_t) eSAP_STATUS_SUCCESS);
break;
case eCSR_ROAM_REMAIN_CHAN_READY:
+ VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
+ FL("CSR roamStatus = %s (%d)"),
+ "eCSR_ROAM_REMAIN_CHAN_READY", roamStatus);
sapSignalHDDevent(sapContext, pCsrRoamInfo,
eSAP_REMAIN_CHAN_READY,
(v_PVOID_t) eSAP_STATUS_SUCCESS);
break;
case eCSR_ROAM_SEND_ACTION_CNF:
+ VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
+ FL("CSR roamStatus = %s (%d)"),
+ "eCSR_ROAM_SEND_ACTION_CNF", roamStatus);
sapSignalHDDevent(sapContext, pCsrRoamInfo,
eSAP_SEND_ACTION_CNF,
(v_PVOID_t)((eSapStatus)((roamResult == eCSR_ROAM_RESULT_NONE)
@@ -1259,13 +1281,17 @@
break;
case eCSR_ROAM_DISCONNECT_ALL_P2P_CLIENTS:
+ VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
+ FL("CSR roamStatus = %s (%d)"),
+ "eCSR_ROAM_DISCONNECT_ALL_P2P_CLIENTS", roamStatus);
sapSignalHDDevent(sapContext, pCsrRoamInfo,
eSAP_DISCONNECT_ALL_P2P_CLIENT,
(v_PVOID_t) eSAP_STATUS_SUCCESS );
break;
case eCSR_ROAM_SEND_P2P_STOP_BSS:
- VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, Received stopbss", __func__);
+ VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
+ FL("Received stopbss"));
sapSignalHDDevent(sapContext, pCsrRoamInfo,
eSAP_MAC_TRIG_STOP_BSS_EVENT,
(v_PVOID_t) eSAP_STATUS_SUCCESS );
@@ -1273,9 +1299,9 @@
#ifdef WLAN_FEATURE_AP_HT40_24G
case eCSR_ROAM_2040_COEX_INFO_IND:
- VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO,
- "In %s, CSR roamStatus = %s (%d)\n",
- __func__, "eCSR_ROAM_2040_COEX_INFO_IND",
+ VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
+ FL("CSR roamStatus = %s (%d)"),
+ "eCSR_ROAM_2040_COEX_INFO_IND",
roamStatus);
sapCheckHT2040CoexAction(sapContext, pCsrRoamInfo->pSmeHT2040CoexInfoInd);
@@ -1283,19 +1309,20 @@
#endif
default:
- VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR, "In %s, CSR roamStatus not handled roamStatus = %s (%d)\n",
- __func__, get_eRoamCmdStatus_str(roamStatus), roamStatus);
+ VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR,
+ FL("CSR roamStatus not handled roamStatus = %s (%d)"),
+ 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",
- __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",
- __func__, "eCSR_ROAM_RESULT_INFRA_ASSOCIATION_IND", roamResult);
+ VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
+ FL( "CSR roamResult = %s (%d)"),
+ "eCSR_ROAM_RESULT_INFRA_ASSOCIATION_IND",
+ roamResult);
sapContext->nStaWPARSnReqIeLength = pCsrRoamInfo->rsnIELen;
if(sapContext->nStaWPARSnReqIeLength)
@@ -1318,8 +1345,9 @@
if(!VOS_IS_STATUS_SUCCESS(vosStatus))
{
VOS_TRACE(VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR,
- "In %s, CSR roamResult = (%d) MAC ("
- MAC_ADDRESS_STR") fail", __func__, roamResult,
+ FL("CSR roamResult = (%d) MAC ("
+ MAC_ADDRESS_STR") fail"),
+ roamResult,
MAC_ADDR_ARRAY(pCsrRoamInfo->peerMac));
halStatus = eHAL_STATUS_FAILURE;
}
@@ -1327,8 +1355,9 @@
else
{
VOS_TRACE(VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_WARN,
- "In %s, CSR roamResult = (%d) MAC ("
- MAC_ADDRESS_STR") not allowed", __func__, roamResult,
+ FL("CSR roamResult = (%d) MAC ("
+ MAC_ADDRESS_STR") not allowed"),
+ roamResult,
MAC_ADDR_ARRAY(pCsrRoamInfo->peerMac));
halStatus = eHAL_STATUS_FAILURE;
}
@@ -1336,8 +1365,10 @@
break;
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",
- __func__, "eCSR_ROAM_RESULT_INFRA_ASSOCIATION_CNF", roamResult);
+ VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
+ FL("CSR roamResult = %s (%d)"),
+ "eCSR_ROAM_RESULT_INFRA_ASSOCIATION_CNF",
+ roamResult);
sapContext->nStaWPARSnReqIeLength = pCsrRoamInfo->rsnIELen;
if (sapContext->nStaWPARSnReqIeLength)
@@ -1368,8 +1399,10 @@
break;
case eCSR_ROAM_RESULT_DISASSOC_IND:
- VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, CSR roamResult = %s (%d)\n",
- __func__, "eCSR_ROAM_RESULT_DISASSOC_IND", roamResult);
+ VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
+ FL("CSR roamResult = %s (%d)"),
+ "eCSR_ROAM_RESULT_DISASSOC_IND",
+ roamResult);
#ifdef WLAN_FEATURE_AP_HT40_24G
sapRemoveHT40IntolerantSta(sapContext, pCsrRoamInfo);
#endif
@@ -1382,8 +1415,10 @@
break;
case eCSR_ROAM_RESULT_DEAUTH_IND:
- VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, CSR roamResult = %s (%d)\n",
- __func__, "eCSR_ROAM_RESULT_DEAUTH_IND", roamResult);
+ VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
+ FL("CSR roamResult = %s (%d)"),
+ "eCSR_ROAM_RESULT_DEAUTH_IND",
+ roamResult);
#ifdef WLAN_FEATURE_AP_HT40_24G
sapRemoveHT40IntolerantSta(sapContext, pCsrRoamInfo);
#endif
@@ -1397,8 +1432,10 @@
break;
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",
- __func__, "eCSR_ROAM_RESULT_MIC_ERROR_GROUP", roamResult);
+ VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
+ FL("CSR roamResult = %s (%d)"),
+ "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);
@@ -1409,8 +1446,10 @@
break;
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",
- __func__, "eCSR_ROAM_RESULT_MIC_ERROR_UNICAST", roamResult);
+ VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
+ FL("CSR roamResult = %s (%d)"),
+ "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);
@@ -1421,8 +1460,10 @@
break;
case eCSR_ROAM_RESULT_AUTHENTICATED:
- VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, CSR roamResult = %s (%d)\n",
- __func__, "eCSR_ROAM_RESULT_AUTHENTICATED", roamResult);
+ VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
+ FL("CSR roamResult = %s (%d)"),
+ "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))
@@ -1432,15 +1473,19 @@
break;
case eCSR_ROAM_RESULT_ASSOCIATED:
- VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, CSR roamResult = %s (%d)\n",
- __func__, "eCSR_ROAM_RESULT_ASSOCIATED", roamResult);
+ VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
+ FL("CSR roamResult = %s (%d)"),
+ "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",
- __func__, "eCSR_ROAM_RESULT_INFRA_STARTED", roamResult);
+ VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
+ FL("CSR roamResult = %s (%d)"),
+ "eCSR_ROAM_RESULT_INFRA_STARTED",
+ roamResult);
/* Fill in the event structure */
sapEvent.event = eSAP_MAC_START_BSS_SUCCESS;
sapEvent.params = pCsrRoamInfo;
@@ -1456,8 +1501,10 @@
break;
case eCSR_ROAM_RESULT_INFRA_STOPPED:
- VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, CSR roamResult = %s (%d)\n",
- __func__, "eCSR_ROAM_RESULT_INFRA_STOPPED", roamResult);
+ VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
+ FL("CSR roamResult = %s (%d)"),
+ "eCSR_ROAM_RESULT_INFRA_STOPPED",
+ roamResult);
/* Fill in the event structure */
sapEvent.event = eSAP_MAC_READY_FOR_CONNECTIONS;
sapEvent.params = pCsrRoamInfo;
@@ -1473,8 +1520,10 @@
break;
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",
- __func__, "eCSR_ROAM_RESULT_WPS_PBC_PROBE_REQ_IND", roamResult);
+ VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
+ FL("CSR roamResult = %s (%d)"),
+ "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);
@@ -1485,8 +1534,10 @@
break;
case eCSR_ROAM_RESULT_FORCED:
- VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, CSR roamResult = %s (%d)\n",
- __func__, "eCSR_ROAM_RESULT_FORCED", roamResult);
+ VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
+ FL("CSR roamResult = %s (%d)"),
+ "eCSR_ROAM_RESULT_FORCED",
+ roamResult);
#ifdef WLAN_FEATURE_AP_HT40_24G
sapRemoveHT40IntolerantSta(sapContext, pCsrRoamInfo);
#endif
@@ -1496,8 +1547,10 @@
break;
case eCSR_ROAM_RESULT_NONE:
- VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, CSR roamResult = %s (%d)\n",
- __func__, "eCSR_ROAM_RESULT_NONE", roamResult);
+ VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
+ FL("CSR roamResult = %s (%d)"),
+ "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)
@@ -1511,8 +1564,10 @@
break;
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",
- __func__, "eCSR_ROAM_RESULT_MAX_ASSOC_EXCEEDED", roamResult);
+ VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
+ FL("CSR roamResult = %s (%d)"),
+ "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))
@@ -1522,8 +1577,10 @@
break;
default:
- VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR, "In %s, CSR roamResult = %s (%d) not handled\n",
- __func__,get_eCsrRoamResult_str(roamResult),roamResult);
+ VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR,
+ FL("CSR roamResult = %s (%d) not handled"),
+ get_eCsrRoamResult_str(roamResult),
+ roamResult);
break;
}
diff --git a/CORE/SAP/src/sapFsm.c b/CORE/SAP/src/sapFsm.c
index 87b4eb6..2004875 100644
--- a/CORE/SAP/src/sapFsm.c
+++ b/CORE/SAP/src/sapFsm.c
@@ -720,8 +720,8 @@
/* Format the Start BSS Complete event to return... */
if (NULL == sapContext->pfnSapEventCallback)
{
- VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR, "%s: HDD Event"
- " callaback invalid", __func__);
+ VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR,
+ FL("HDD Event callaback invalid"));
return VOS_STATUS_E_INVAL;
}
@@ -749,8 +749,9 @@
}
break;
case eSAP_START_BSS_EVENT:
- VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, SAP event callback event = %s",
- __func__, "eSAP_START_BSS_EVENT");
+ VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
+ FL("SAP event callback event = %s"),
+ "eSAP_START_BSS_EVENT");
sapApAppEvent.sapHddEventCode = eSAP_START_BSS_EVENT;
sapApAppEvent.sapevt.sapStartBssCompleteEvent.status = (eSapStatus )context;
if(pCsrRoamInfo != NULL ){
@@ -762,16 +763,18 @@
break;
case eSAP_STOP_BSS_EVENT:
- VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, SAP event callback event = %s",
- __func__, "eSAP_STOP_BSS_EVENT");
+ VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
+ FL("SAP event callback event = %s"),
+ "eSAP_STOP_BSS_EVENT");
sapApAppEvent.sapHddEventCode = eSAP_STOP_BSS_EVENT;
sapApAppEvent.sapevt.sapStopBssCompleteEvent.status = (eSapStatus )context;
break;
case eSAP_STA_ASSOC_EVENT:
{
- VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, SAP event callback event = %s",
- __func__, "eSAP_STA_ASSOC_EVENT");
+ VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
+ FL("SAP event callback event = %s"),
+ "eSAP_STA_ASSOC_EVENT");
if (pCsrRoamInfo->fReassocReq)
sapApAppEvent.sapHddEventCode = eSAP_STA_REASSOC_EVENT;
else
@@ -803,8 +806,9 @@
}
case eSAP_STA_DISASSOC_EVENT:
- VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, SAP event callback event = %s",
- __func__, "eSAP_STA_DISASSOC_EVENT");
+ VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
+ FL("SAP event callback event = %s"),
+ "eSAP_STA_DISASSOC_EVENT");
sapApAppEvent.sapHddEventCode = eSAP_STA_DISASSOC_EVENT;
vos_mem_copy( &sapApAppEvent.sapevt.sapStationDisassocCompleteEvent.staMac,
@@ -820,8 +824,9 @@
break;
case eSAP_STA_SET_KEY_EVENT:
- VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, SAP event callback event = %s",
- __func__, "eSAP_STA_SET_KEY_EVENT");
+ VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
+ FL("SAP event callback event = %s"),
+ "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,
@@ -829,8 +834,9 @@
break;
case eSAP_STA_DEL_KEY_EVENT :
- VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, SAP event callback event = %s",
- __func__, "eSAP_STA_DEL_KEY_EVENT");
+ VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
+ FL("SAP event callback event = %s"),
+ "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
@@ -838,8 +844,9 @@
break;
case eSAP_STA_MIC_FAILURE_EVENT :
- VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, SAP event callback event = %s",
- __func__, "eSAP_STA_MIC_FAILURE_EVENT");
+ VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
+ FL("SAP event callback event = %s"),
+ "eSAP_STA_MIC_FAILURE_EVENT");
sapApAppEvent.sapHddEventCode = eSAP_STA_MIC_FAILURE_EVENT;
vos_mem_copy( &sapApAppEvent.sapevt.sapStationMICFailureEvent.srcMacAddr,
pCsrRoamInfo->u.pMICFailureInfo->srcMacAddr,
@@ -859,11 +866,15 @@
break;
case eSAP_ASSOC_STA_CALLBACK_EVENT:
- VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, SAP event callback event = %s",
- __func__, "eSAP_ASSOC_STA_CALLBACK_EVENT");
+ VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
+ FL("SAP event callback event = %s"),
+ "eSAP_ASSOC_STA_CALLBACK_EVENT");
break;
case eSAP_WPS_PBC_PROBE_REQ_EVENT:
+ VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
+ FL("SAP event callback event = %s"),
+ "eSAP_WPS_PBC_PROBE_REQ_EVENT");
sapApAppEvent.sapHddEventCode = eSAP_WPS_PBC_PROBE_REQ_EVENT;
vos_mem_copy( &sapApAppEvent.sapevt.sapPBCProbeReqEvent.WPSPBCProbeReq,
@@ -873,8 +884,8 @@
case eSAP_INDICATE_MGMT_FRAME:
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
- "In %s, SAP event callback event = %s",
- __func__, "eSAP_INDICATE_MGMT_FRAME");
+ FL("SAP event callback event = %s"),
+ "eSAP_INDICATE_MGMT_FRAME");
sapApAppEvent.sapHddEventCode = eSAP_INDICATE_MGMT_FRAME;
sapApAppEvent.sapevt.sapManagementFrameInfo.nFrameLength
= pCsrRoamInfo->nFrameLength;
@@ -888,30 +899,30 @@
break;
case eSAP_REMAIN_CHAN_READY:
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
- "In %s, SAP event callback event = %s",
- __func__, "eSAP_REMAIN_CHAN_READY");
+ FL("SAP event callback event = %s"),
+ "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",
- __func__, "eSAP_SEND_ACTION_CNF");
+ FL("SAP event callback event = %s"),
+ "eSAP_SEND_ACTION_CNF");
sapApAppEvent.sapHddEventCode = eSAP_SEND_ACTION_CNF;
sapApAppEvent.sapevt.sapActionCnf.actionSendSuccess = (eSapStatus)context;
break;
case eSAP_DISCONNECT_ALL_P2P_CLIENT:
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
- "In %s, SAP event callback event = %s",
- __func__, "eSAP_DISCONNECT_ALL_P2P_CLIENT");
+ FL("SAP event callback event = %s"),
+ "eSAP_DISCONNECT_ALL_P2P_CLIENT");
sapApAppEvent.sapHddEventCode = eSAP_DISCONNECT_ALL_P2P_CLIENT;
sapApAppEvent.sapevt.sapActionCnf.actionSendSuccess = (eSapStatus)context;
break;
case eSAP_MAC_TRIG_STOP_BSS_EVENT :
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
- "In %s, SAP event callback event = %s",
- __func__, "eSAP_MAC_TRIG_STOP_BSS_EVENT");
+ FL("SAP event callback event = %s"),
+ "eSAP_MAC_TRIG_STOP_BSS_EVENT");
sapApAppEvent.sapHddEventCode = eSAP_MAC_TRIG_STOP_BSS_EVENT;
sapApAppEvent.sapevt.sapActionCnf.actionSendSuccess = (eSapStatus)context;
break;
@@ -919,8 +930,8 @@
case eSAP_UNKNOWN_STA_JOIN:
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
- "In %s, SAP event callback event = %s",
- __func__, "eSAP_UNKNOWN_STA_JOIN");
+ FL("SAP event callback event = %s"),
+ "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));
@@ -928,16 +939,17 @@
case eSAP_MAX_ASSOC_EXCEEDED:
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
- "In %s, SAP event callback event = %s",
- __func__, "eSAP_MAX_ASSOC_EXCEEDED");
+ FL("SAP event callback event = %s"),
+ "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));
break;
default:
- VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR, "In %s, SAP Unknown callback event = %d",
- __func__,sapHddevent);
+ VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR,
+ FL("SAP Unknown callback event = %d"),
+ sapHddevent);
break;
}
vosStatus = (*sapContext->pfnSapEventCallback)