Merge "Wlan: Update the protStatusCode in Re/assoc response in case of failure"
diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c
index ec03f8d..6e0a10b 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -1221,7 +1221,6 @@
v_VOID_t *pData)
{
hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
- tpSirWifiRateStat pWifiRateStat;
tpSirWifiPeerStat pWifiPeerStat;
tpSirWifiPeerInfo pWifiPeerInfo;
struct nlattr *peerInfo;
@@ -1241,70 +1240,6 @@
hddLog(VOS_TRACE_LEVEL_INFO,
"LL_STATS_PEER_ALL : numPeers %u",
pWifiPeerStat->numPeers);
- {
- for (i = 0; i < pWifiPeerStat->numPeers; i++)
- {
- pWifiPeerInfo = (tpSirWifiPeerInfo)
- ((uint8 *)pWifiPeerStat->peerInfo +
- ( i * sizeof(tSirWifiPeerInfo)));
-
- if (WLAN_HDD_INFRA_STATION == pAdapter->device_mode) {
- pWifiPeerInfo->type = WIFI_PEER_AP;
- }
- if (WLAN_HDD_P2P_CLIENT == pAdapter->device_mode) {
- pWifiPeerInfo->type = WIFI_PEER_P2P_GO;
- }
-
- hddLog(VOS_TRACE_LEVEL_INFO,
- " %d) LL_STATS Channel Stats "
- " Peer Type %u "
- " peerMacAddress %pM "
- " capabilities 0x%x "
- " numRate %u ",
- i,
- pWifiPeerInfo->type,
- pWifiPeerInfo->peerMacAddress,
- pWifiPeerInfo->capabilities,
- pWifiPeerInfo->numRate);
- {
- int j;
- for (j = 0; j < pWifiPeerInfo->numRate; j++)
- {
- pWifiRateStat = (tpSirWifiRateStat)
- ((tANI_U8 *) pWifiPeerInfo->rateStats +
- ( j * sizeof(tSirWifiRateStat)));
-
- hddLog(VOS_TRACE_LEVEL_INFO,
- " peer Rate Stats "
- " preamble %u "
- " nss %u "
- " bw %u "
- " rateMcsIdx %u "
- " reserved %u "
- " bitrate %u "
- " txMpdu %u "
- " rxMpdu %u "
- " mpduLost %u "
- " retries %u "
- " retriesShort %u "
- " retriesLong %u",
- pWifiRateStat->rate.preamble,
- pWifiRateStat->rate.nss,
- pWifiRateStat->rate.bw,
- pWifiRateStat->rate.rateMcsIdx,
- pWifiRateStat->rate.reserved,
- pWifiRateStat->rate.bitrate,
- pWifiRateStat->txMpdu,
- pWifiRateStat->rxMpdu,
- pWifiRateStat->mpduLost,
- pWifiRateStat->retries,
- pWifiRateStat->retriesShort,
- pWifiRateStat->retriesLong);
- }
- }
- }
- }
-
/*
* Allocate a size of 4096 for the peer stats comprising
* each of size = sizeof (tSirWifiPeerInfo) + numRate *
@@ -1443,95 +1378,7 @@
hddLog(VOS_TRACE_LEVEL_INFO,
"WMI_LINK_STATS_IFACE Data");
- hddLog(VOS_TRACE_LEVEL_INFO,
- "LL_STATS_IFACE: "
- " Mode %u "
- " MAC %pM "
- " State %u "
- " Roaming %u "
- " capabilities 0x%x "
- " SSID %s "
- " BSSID %pM",
- pWifiIfaceStat->info.mode,
- pWifiIfaceStat->info.macAddr,
- pWifiIfaceStat->info.state,
- pWifiIfaceStat->info.roaming,
- pWifiIfaceStat->info.capabilities,
- pWifiIfaceStat->info.ssid,
- pWifiIfaceStat->info.bssid);
-
- hddLog(VOS_TRACE_LEVEL_INFO,
- " AP country str: %c%c%c",
- pWifiIfaceStat->info.apCountryStr[0],
- pWifiIfaceStat->info.apCountryStr[1],
- pWifiIfaceStat->info.apCountryStr[2]);
-
-
- hddLog(VOS_TRACE_LEVEL_INFO,
- " Country Str Association: %c%c%c",
- pWifiIfaceStat->info.countryStr[0],
- pWifiIfaceStat->info.countryStr[1],
- pWifiIfaceStat->info.countryStr[2]);
-
- hddLog(VOS_TRACE_LEVEL_INFO,
- " beaconRx %u "
- " mgmtRx %u "
- " mgmtActionRx %u "
- " mgmtActionTx %u "
- " rssiMgmt %d "
- " rssiData %d "
- " rssiAck %d",
- pWifiIfaceStat->beaconRx,
- pWifiIfaceStat->mgmtRx,
- pWifiIfaceStat->mgmtActionRx,
- pWifiIfaceStat->mgmtActionTx,
- pWifiIfaceStat->rssiMgmt,
- pWifiIfaceStat->rssiData,
- pWifiIfaceStat->rssiAck );
-
-
- {
- int i;
- for (i = 0 ; i < WIFI_AC_MAX; i ++)
- {
- hddLog(VOS_TRACE_LEVEL_INFO,
-
- " %d) LL_STATS IFACE: "
- " ac: %u txMpdu: %u "
- " rxMpdu: %u txMcast: %u "
- " rxMcast: %u rxAmpdu: %u "
- " txAmpdu: %u mpduLost: %u "
- " retries: %u retriesShort: %u "
- " retriesLong: %u contentionTimeMin: %u "
- " contentionTimeMax: %u contentionTimeAvg: %u "
- " contentionNumSamples: %u",
- i,
- pWifiIfaceStat->AccessclassStats[i].ac,
- pWifiIfaceStat->AccessclassStats[i].txMpdu,
- pWifiIfaceStat->AccessclassStats[i].rxMpdu,
- pWifiIfaceStat->AccessclassStats[i].txMcast,
- pWifiIfaceStat->AccessclassStats[i].rxMcast,
- pWifiIfaceStat->AccessclassStats[i].rxAmpdu,
- pWifiIfaceStat->AccessclassStats[i].txAmpdu,
- pWifiIfaceStat->AccessclassStats[i].mpduLost,
- pWifiIfaceStat->AccessclassStats[i].retries,
- pWifiIfaceStat->
- AccessclassStats[i].retriesShort,
- pWifiIfaceStat->AccessclassStats[i].retriesLong,
- pWifiIfaceStat->
- AccessclassStats[i].contentionTimeMin,
- pWifiIfaceStat->
- AccessclassStats[i].contentionTimeMax,
- pWifiIfaceStat->
- AccessclassStats[i].contentionTimeAvg,
- pWifiIfaceStat->
- AccessclassStats[i].contentionNumSamples);
-
- }
- }
-
cfg80211_vendor_cmd_reply(vendor_event);
-
EXIT();
}
@@ -1655,23 +1502,6 @@
pWifiRadioStat->channels +
(i * sizeof(tSirWifiChannelStats)));
- hddLog(VOS_TRACE_LEVEL_INFO,
- " %d) Channel Info"
- " width is %u "
- " CenterFreq %u "
- " CenterFreq0 %u "
- " CenterFreq1 %u "
- " onTime %u "
- " ccaBusyTime %u",
- i,
- pWifiChannelStats->channel.width,
- pWifiChannelStats->channel.centerFreq,
- pWifiChannelStats->channel.centerFreq0,
- pWifiChannelStats->channel.centerFreq1,
- pWifiChannelStats->onTime,
- pWifiChannelStats->ccaBusyTime);
-
-
chInfo = nla_nest_start(vendor_event, i);
if(!chInfo)
{
@@ -1756,24 +1586,13 @@
{
case SIR_HAL_LL_STATS_RESULTS_RSP:
{
- hddLog(VOS_TRACE_LEVEL_INFO,
- FL("RESPONSE SIR_HAL_LL_STATS_RESULTS_RSP") );
- hddLog(VOS_TRACE_LEVEL_INFO,
- "LL_STATS RESULTS RESPONSE paramID = 0x%x",
- linkLayerStatsResults->paramId);
- hddLog(VOS_TRACE_LEVEL_INFO,
- "LL_STATS RESULTS RESPONSE ifaceId = %u MAC: %pM",
- linkLayerStatsResults->ifaceId, macAddr);
- hddLog(VOS_TRACE_LEVEL_INFO,
- "LL_STATS RESULTS RESPONSE respId = %u",
- linkLayerStatsResults->respId);
- hddLog(VOS_TRACE_LEVEL_INFO,
- "LL_STATS RESULTS RESPONSE moreResultToFollow = %u",
+ hddLog(VOS_TRACE_LEVEL_INFO,
+ "LL_STATS RESP paramID = 0x%x, ifaceId = %u MAC: %pM "
+ "respId = %u, moreResultToFollow = %u",
+ linkLayerStatsResults->paramId, linkLayerStatsResults->ifaceId,
+ macAddr, linkLayerStatsResults->respId,
linkLayerStatsResults->moreResultToFollow);
- hddLog(VOS_TRACE_LEVEL_INFO,
- "LL_STATS RESULTS RESPONSE result = %p",
- linkLayerStatsResults->result);
- spin_lock(&hdd_context_lock);
+ spin_lock(&hdd_context_lock);
context = &pHddCtx->ll_stats_context;
/* validate response received from target */
if ((context->request_id != linkLayerStatsResults->respId) ||
@@ -1917,15 +1736,11 @@
hddLog(VOS_TRACE_LEVEL_INFO,
- "LL_STATS_SET reqId = %d", linkLayerStatsSetReq.reqId);
- hddLog(VOS_TRACE_LEVEL_INFO,
- "LL_STATS_SET MAC = %pM", linkLayerStatsSetReq.macAddr);
- hddLog(VOS_TRACE_LEVEL_INFO,
- "LL_STATS_SET mpduSizeThreshold = %d",
- linkLayerStatsSetReq.mpduSizeThreshold);
- hddLog(VOS_TRACE_LEVEL_INFO,
- "LL_STATS_SET aggressive Statistics Gathering = %d",
- linkLayerStatsSetReq.aggressiveStatisticsGathering);
+ "LL_STATS_SET reqId = %d, MAC = %pM, mpduSizeThreshold = %d "
+ "Statistics Gathering = %d ",
+ linkLayerStatsSetReq.reqId, linkLayerStatsSetReq.macAddr,
+ linkLayerStatsSetReq.mpduSizeThreshold,
+ linkLayerStatsSetReq.aggressiveStatisticsGathering);
if (eHAL_STATUS_SUCCESS != sme_SetLinkLayerStatsIndCB(
pHddCtx->hHal,
@@ -2077,11 +1892,8 @@
pAdapter->macAddressCurrent.bytes, sizeof(v_MACADDR_t));
hddLog(VOS_TRACE_LEVEL_INFO,
- "LL_STATS_GET reqId = %d", linkLayerStatsGetReq.reqId);
- hddLog(VOS_TRACE_LEVEL_INFO,
- "LL_STATS_GET MAC = %pM", linkLayerStatsGetReq.macAddr);
- hddLog(VOS_TRACE_LEVEL_INFO,
- "LL_STATS_GET paramIdMask = %d",
+ "LL_STATS_GET reqId = %d, MAC = %pM, paramIdMask = %d",
+ linkLayerStatsGetReq.reqId, linkLayerStatsGetReq.macAddr,
linkLayerStatsGetReq.paramIdMask);
spin_lock(&hdd_context_lock);
@@ -2215,14 +2027,11 @@
pAdapter->macAddressCurrent.bytes, sizeof(v_MACADDR_t));
hddLog(VOS_TRACE_LEVEL_INFO,
- "LL_STATS_CLEAR reqId = %d", linkLayerStatsClearReq.reqId);
- hddLog(VOS_TRACE_LEVEL_INFO,
- "LL_STATS_CLEAR MAC = %pM", linkLayerStatsClearReq.macAddr);
- hddLog(VOS_TRACE_LEVEL_INFO,
- "LL_STATS_CLEAR statsClearReqMask = 0x%X",
- linkLayerStatsClearReq.statsClearReqMask);
- hddLog(VOS_TRACE_LEVEL_INFO,
- "LL_STATS_CLEAR stopReq = %d",
+ "LL_STATS_CLEAR reqId = %d, MAC = %pM,"
+ "statsClearReqMask = 0x%X, stopReq = %d",
+ linkLayerStatsClearReq.reqId,
+ linkLayerStatsClearReq.macAddr,
+ linkLayerStatsClearReq.statsClearReqMask,
linkLayerStatsClearReq.stopReq);
if (eHAL_STATUS_SUCCESS == sme_LLStatsClearReq(pHddCtx->hHal,
diff --git a/CORE/HDD/src/wlan_hdd_trace.c b/CORE/HDD/src/wlan_hdd_trace.c
index 766431e..0713e1c 100644
--- a/CORE/HDD/src/wlan_hdd_trace.c
+++ b/CORE/HDD/src/wlan_hdd_trace.c
@@ -119,13 +119,13 @@
{
if (TRACE_CODE_HDD_RX_SME_MSG == pRecord->code)
{
- hddLog(LOGE, "%04d %012u S%d %-14s %-30s(0x%x) ",
+ hddLog(LOG1, "%04d %012u S%d %-14s %-30s(0x%x)",
recIndex, pRecord->time, pRecord->session, "RX SME MSG:",
get_eRoamCmdStatus_str(pRecord->data), pRecord->data);
}
else
{
- hddLog(LOGE, "%04d %012u S%d %-14s %-30s(0x%x) ",
+ hddLog(LOG1, "%04d %012u S%d %-14s %-30s(0x%x)",
recIndex, pRecord->time, pRecord->session, "HDD Event:",
hddTraceGetEventString(pRecord->code), pRecord->data);
}
diff --git a/CORE/MAC/inc/wniCfg.h b/CORE/MAC/inc/wniCfg.h
index f1d4f2a..60f78c6 100644
--- a/CORE/MAC/inc/wniCfg.h
+++ b/CORE/MAC/inc/wniCfg.h
@@ -1195,7 +1195,7 @@
#define WNI_CFG_VHT_SU_BEAMFORMEE_CAP_STAMIN 0
#define WNI_CFG_VHT_SU_BEAMFORMEE_CAP_STAMAX 1
-#define WNI_CFG_VHT_SU_BEAMFORMEE_CAP_STADEF 0
+#define WNI_CFG_VHT_SU_BEAMFORMEE_CAP_STADEF 1
#define WNI_CFG_VHT_CSN_BEAMFORMEE_ANT_SUPPORTED_STAMIN 0
#define WNI_CFG_VHT_CSN_BEAMFORMEE_ANT_SUPPORTED_STAMAX 4
diff --git a/CORE/MAC/src/pe/lim/limTrace.c b/CORE/MAC/src/pe/lim/limTrace.c
index b7ed07e..68ea147 100644
--- a/CORE/MAC/src/pe/lim/limTrace.c
+++ b/CORE/MAC/src/pe/lim/limTrace.c
@@ -151,104 +151,154 @@
switch (pRecord->code) {
case TRACE_CODE_MLM_STATE:
- limLog(pMac, LOGE, "%04d %012u S%d %-14s %-30s(0x%x) ", recIndex, pRecord->time, pRecord->session,
- "MLM State:", limTraceGetMlmStateString((tANI_U16)pRecord->data), pRecord->data );
+ limLog(pMac, LOG1, "%04d %012u S%d %-14s %-30s(0x%x)",
+ recIndex, pRecord->time, pRecord->session,
+ "MLM State:",
+ limTraceGetMlmStateString((tANI_U16)pRecord->data),
+ pRecord->data);
break;
case TRACE_CODE_SME_STATE:
- limLog(pMac, LOGE, "%04d %012u S%d %-14s %-30s(0x%x) ", recIndex, pRecord->time, pRecord->session,
- "SME State:", limTraceGetSmeStateString((tANI_U16)pRecord->data), pRecord->data );
+ limLog(pMac, LOG1, "%04d %012u S%d %-14s %-30s(0x%x)",
+ recIndex, pRecord->time, pRecord->session,
+ "SME State:",
+ limTraceGetSmeStateString((tANI_U16)pRecord->data),
+ pRecord->data);
break;
case TRACE_CODE_TX_MGMT:
- limLog(pMac, LOGE, "%04d %012u S%d %-14s %-30s(0x%x) ", recIndex, pRecord->time, pRecord->session,
- "TX Mgmt:", frameSubtypeStr[pRecord->data], pRecord->data );
+ limLog(pMac, LOG1, "%04d %012u S%d %-14s %-30s(0x%x)",
+ recIndex, pRecord->time, pRecord->session,
+ "TX Mgmt:", frameSubtypeStr[pRecord->data], pRecord->data);
break;
case TRACE_CODE_RX_MGMT:
if (LIM_TRACE_MAX_SUBTYPES <= LIM_TRACE_GET_SUBTYPE(pRecord->data))
{
- limLog(pMac, LOGE, "Wrong Subtype - %d", LIM_TRACE_GET_SUBTYPE(pRecord->data));
+ limLog(pMac, LOG1, "Wrong Subtype - %d",
+ LIM_TRACE_GET_SUBTYPE(pRecord->data));
}
else
{
- limLog(pMac, LOGE, "%04d %012u S%d %-14s %-30s(%d) SN: %d ", recIndex, pRecord->time, pRecord->session,
- "RX Mgmt:", frameSubtypeStr[LIM_TRACE_GET_SUBTYPE(pRecord->data)],
- LIM_TRACE_GET_SUBTYPE(pRecord->data),
- LIM_TRACE_GET_SSN(pRecord->data) );
+ limLog(pMac,
+ LOG1, "%04d %012u S%d %-14s %-30s(%d) SN: %d ",
+ recIndex, pRecord->time, pRecord->session,
+ "RX Mgmt:",
+ frameSubtypeStr[LIM_TRACE_GET_SUBTYPE(pRecord->data)],
+ LIM_TRACE_GET_SUBTYPE(pRecord->data),
+ LIM_TRACE_GET_SSN(pRecord->data));
}
break;
case TRACE_CODE_RX_MGMT_DROP:
- limLog(pMac, LOGE, "%04d %012u S%d %-14s %-30s(%d) ", recIndex, pRecord->time, pRecord->session,
- "Drop RX Mgmt:", __limTraceGetMgmtDropReasonString((tANI_U16)pRecord->data), pRecord->data);
+ limLog(pMac, LOG1, "%04d %012u S%d %-14s %-30s(%d)",
+ recIndex, pRecord->time, pRecord->session,
+ "Drop RX Mgmt:",
+ __limTraceGetMgmtDropReasonString((tANI_U16)pRecord->data),
+ pRecord->data);
break;
case TRACE_CODE_RX_MGMT_TSF:
- limLog(pMac, LOGE, "%04d %012u S%d %-14s %-30s0x%x(%d) ", recIndex, pRecord->time, pRecord->session,
- "RX Mgmt TSF:", " ", pRecord->data, pRecord->data );
+ limLog(pMac, LOG1, "%04d %012u S%d %-14s %-30s0x%x(%d)",
+ recIndex, pRecord->time, pRecord->session,
+ "RX Mgmt TSF:", " ", pRecord->data, pRecord->data);
break;
case TRACE_CODE_TX_COMPLETE:
- limLog(pMac, LOGE, "%04d %012u S%d %-14s %d", recIndex, pRecord->time, pRecord->session,
- "TX Complete", pRecord->data );
+ limLog(pMac, LOG1, "%04d %012u S%d %-14s %d",
+ recIndex, pRecord->time, pRecord->session,
+ "TX Complete", pRecord->data);
break;
case TRACE_CODE_TX_SME_MSG:
- limLog(pMac, LOGE, "%04d %012u S%d %-14s %-30s(0x%x) ", recIndex, pRecord->time, pRecord->session,
- "TX SME Msg:", macTraceGetSmeMsgString((tANI_U16)pRecord->data), pRecord->data );
+ limLog(pMac, LOG1, "%04d %012u S%d %-14s %-30s(0x%x)",
+ recIndex, pRecord->time, pRecord->session,
+ "TX SME Msg:",
+ macTraceGetSmeMsgString((tANI_U16)pRecord->data),
+ pRecord->data );
break;
case TRACE_CODE_RX_SME_MSG:
- limLog(pMac, LOGE, "%04d %012u S%d %-14s %-30s(0x%x) ", recIndex, pRecord->time, pRecord->session,
- LIM_TRACE_GET_DEFRD_OR_DROPPED(pRecord->data) ? "Def/Drp LIM Msg:": "RX Sme Msg:",
- macTraceGetSmeMsgString((tANI_U16)pRecord->data), pRecord->data );
+ limLog(pMac, LOG1, "%04d %012u S%d %-14s %-30s(0x%x)",
+ recIndex, pRecord->time, pRecord->session,
+ LIM_TRACE_GET_DEFRD_OR_DROPPED(pRecord->data)
+ ? "Def/Drp LIM Msg:": "RX Sme Msg:",
+ macTraceGetSmeMsgString((tANI_U16)pRecord->data),
+ pRecord->data);
break;
case TRACE_CODE_TX_WDA_MSG:
- limLog(pMac, LOGE, "%04d %012u S%d %-14s %-30s(0x%x) ", recIndex, pRecord->time, pRecord->session,
- "TX WDA Msg:", macTraceGetWdaMsgString((tANI_U16)pRecord->data), pRecord->data );
+ limLog(pMac, LOG1, "%04d %012u S%d %-14s %-30s(0x%x)",
+ recIndex, pRecord->time, pRecord->session,
+ "TX WDA Msg:",
+ macTraceGetWdaMsgString((tANI_U16)pRecord->data),
+ pRecord->data);
break;
case TRACE_CODE_RX_WDA_MSG:
- limLog(pMac, LOGE, "%04d %012u S%d %-14s %-30s(0x%x) ", recIndex, pRecord->time, pRecord->session,
- LIM_TRACE_GET_DEFRD_OR_DROPPED(pRecord->data) ? "Def/Drp LIM Msg:": "RX WDA Msg:",
- macTraceGetWdaMsgString((tANI_U16)pRecord->data), pRecord->data );
+ limLog(pMac, LOG1, "%04d %012u S%d %-14s %-30s(0x%x)",
+ recIndex, pRecord->time, pRecord->session,
+ LIM_TRACE_GET_DEFRD_OR_DROPPED(pRecord->data)
+ ? "Def/Drp LIM Msg:": "RX WDA Msg:",
+ macTraceGetWdaMsgString((tANI_U16)pRecord->data),
+ pRecord->data );
break;
case TRACE_CODE_TX_LIM_MSG:
- limLog(pMac, LOGE, "%04d %012u S%d %-14s %-30s(0x%x) ", recIndex, pRecord->time, pRecord->session,
- "TX LIM Msg:", macTraceGetLimMsgString((tANI_U16)pRecord->data), pRecord->data );
+ limLog(pMac, LOG1, "%04d %012u S%d %-14s %-30s(0x%x)",
+ recIndex, pRecord->time, pRecord->session,
+ "TX LIM Msg:",
+ macTraceGetLimMsgString((tANI_U16)pRecord->data),
+ pRecord->data);
break;
case TRACE_CODE_RX_LIM_MSG:
- limLog(pMac, LOGE, "%04d %012u S%d %-14s %-30s(0x%x) ", recIndex, pRecord->time, pRecord->session,
- LIM_TRACE_GET_DEFRD_OR_DROPPED(pRecord->data) ? "Def/Drp LIM Msg:": "RX LIM Msg",
- macTraceGetLimMsgString((tANI_U16)pRecord->data), pRecord->data );
+ limLog(pMac, LOG1, "%04d %012u S%d %-14s %-30s(0x%x)",
+ recIndex, pRecord->time, pRecord->session,
+ LIM_TRACE_GET_DEFRD_OR_DROPPED(pRecord->data)
+ ? "Def/Drp LIM Msg:": "RX LIM Msg",
+ macTraceGetLimMsgString((tANI_U16)pRecord->data),
+ pRecord->data );
break;
case TRACE_CODE_TX_CFG_MSG:
- limLog(pMac, LOGE, "%04d %012u S%d %-14s %-30s(0x%x) ", recIndex, pRecord->time, pRecord->session,
- "TX CFG Msg:", macTraceGetCfgMsgString((tANI_U16)pRecord->data), pRecord->data );
+ limLog(pMac, LOG1, "%04d %012u S%d %-14s %-30s(0x%x)",
+ recIndex, pRecord->time, pRecord->session,
+ "TX CFG Msg:",
+ macTraceGetCfgMsgString((tANI_U16)pRecord->data),
+ pRecord->data);
break;
case TRACE_CODE_RX_CFG_MSG:
- limLog(pMac, LOGE, "%04d %012u S%d %-14s %-30s(0x%x) ", recIndex, pRecord->time, pRecord->session,
- LIM_TRACE_GET_DEFRD_OR_DROPPED(pRecord->data) ? "Def/Drp LIM Msg:": "RX CFG Msg:",
- macTraceGetCfgMsgString((tANI_U16)MAC_TRACE_GET_MSG_ID(pRecord->data)),
- pRecord->data );
+ limLog(pMac, LOG1, "%04d %012u S%d %-14s %-30s(0x%x)",
+ recIndex, pRecord->time, pRecord->session,
+ LIM_TRACE_GET_DEFRD_OR_DROPPED(pRecord->data)
+ ? "Def/Drp LIM Msg:": "RX CFG Msg:",
+ macTraceGetCfgMsgString
+ ((tANI_U16)MAC_TRACE_GET_MSG_ID(pRecord->data)),
+ pRecord->data);
break;
case TRACE_CODE_TIMER_ACTIVATE:
- limLog(pMac, LOGE, "%04d %012u S%d %-14s %-30s(0x%x) ", recIndex, pRecord->time, pRecord->session,
- "Timer Actvtd", __limTraceGetTimerString((tANI_U16)pRecord->data), pRecord->data );
+ limLog(pMac, LOG1, "%04d %012u S%d %-14s %-30s(0x%x)",
+ recIndex, pRecord->time, pRecord->session,
+ "Timer Actvtd",
+ __limTraceGetTimerString((tANI_U16)pRecord->data),
+ pRecord->data);
break;
case TRACE_CODE_TIMER_DEACTIVATE:
- limLog(pMac, LOGE, "%04d %012u S%d %-14s %-30s(0x%x) ", recIndex, pRecord->time, pRecord->session,
- "Timer DeActvtd", __limTraceGetTimerString((tANI_U16)pRecord->data), pRecord->data );
+ limLog(pMac, LOG1, "%04d %012u S%d %-14s %-30s(0x%x)",
+ recIndex, pRecord->time, pRecord->session,
+ "Timer DeActvtd",
+ __limTraceGetTimerString((tANI_U16)pRecord->data),
+ pRecord->data);
break;
case TRACE_CODE_INFO_LOG:
- limLog(pMac, LOGE, "%04d %012u S%d %-14s %-30s(0x%x) \n", recIndex, pRecord->time, pRecord->session,
- "INFORMATION_LOG", macTraceGetInfoLogString((tANI_U16)pRecord->data), pRecord->data );
+ limLog(pMac, LOG1, "%04d %012u S%d %-14s %-30s(0x%x)",
+ recIndex, pRecord->time, pRecord->session,
+ "INFORMATION_LOG",
+ macTraceGetInfoLogString((tANI_U16)pRecord->data),
+ pRecord->data);
break;
default :
- limLog(pMac, LOGE, "%04d %012u S%d %-14s(%d) (0x%x) ", recIndex, pRecord->time, pRecord->session,
- "Unknown Code", pRecord->code, pRecord->data );
+ limLog(pMac, LOG1, "%04d %012u S%d %-14s(%d) (0x%x)",
+ recIndex, pRecord->time, pRecord->session,
+ "Unknown Code", pRecord->code, pRecord->data);
break;
}
}
diff --git a/CORE/SME/src/sme_common/sme_Api.c b/CORE/SME/src/sme_common/sme_Api.c
index 0e60d56..b341b54 100644
--- a/CORE/SME/src/sme_common/sme_Api.c
+++ b/CORE/SME/src/sme_common/sme_Api.c
@@ -11729,11 +11729,13 @@
csrLLCount(&pMac->sme.smeCmdActiveList) );
smeGetCommandQStatus(hHal);
- vosTraceDumpAll(pMac,0,0,0,0);
/* Initiate SSR to recover */
if (!(vos_isLoadUnloadInProgress() ||
vos_is_logp_in_progress(VOS_MODULE_ID_SME, NULL)))
+ {
+ vosTraceDumpAll(pMac,0,0,0,0);
vos_wlanRestart();
+ }
}
#ifdef FEATURE_WLAN_CH_AVOID
diff --git a/CORE/SME/src/sme_common/sme_Trace.c b/CORE/SME/src/sme_common/sme_Trace.c
index 3542354..e36cf89 100644
--- a/CORE/SME/src/sme_common/sme_Trace.c
+++ b/CORE/SME/src/sme_common/sme_Trace.c
@@ -213,24 +213,24 @@
{
switch (pRecord->code) {
case TRACE_CODE_SME_COMMAND:
- smsLog(pMac, LOGE, "%04d %012u S%d %-14s %-30s(0x%x)",
+ smsLog(pMac, LOG1, "%04d %012u S%d %-14s %-30s(0x%x)",
recIndex, pRecord->time, pRecord->session, "SME COMMAND:",
smeTraceGetCommandString(pRecord->data), pRecord->data);
break;
case TRACE_CODE_SME_TX_WDA_MSG:
- smsLog(pMac, LOGE, "%04d %012u S%d %-14s %-30s(0x%x)",
+ smsLog(pMac, LOG1, "%04d %012u S%d %-14s %-30s(0x%x)",
recIndex, pRecord->time, pRecord->session, "TX WDA Msg:",
macTraceGetWdaMsgString((tANI_U16)pRecord->data),
pRecord->data);
break;
case TRACE_CODE_SME_RX_WDA_MSG:
- smsLog(pMac, LOGE, "%04d %012u S%d %-14s %-30s(0x%x)",
+ smsLog(pMac, LOG1, "%04d %012u S%d %-14s %-30s(0x%x)",
recIndex, pRecord->time, pRecord->session, "RX WDA Msg:",
macTraceGetSmeMsgString((tANI_U16)pRecord->data),
pRecord->data);
break;
default:
- smsLog(pMac, LOGE, "%04d %012u S%d %-14s %-30s(0x%x)",
+ smsLog(pMac, LOG1, "%04d %012u S%d %-14s %-30s(0x%x)",
recIndex, pRecord->time, pRecord->session, "RX HDD MSG:",
smeTraceGetRxMsgString(pRecord->code), pRecord->data);
break;
diff --git a/CORE/TL/src/wlan_qct_tl_trace.c b/CORE/TL/src/wlan_qct_tl_trace.c
index 3a3e2f3..39b4a5f 100644
--- a/CORE/TL/src/wlan_qct_tl_trace.c
+++ b/CORE/TL/src/wlan_qct_tl_trace.c
@@ -64,10 +64,12 @@
void tlTraceDump(void *pMac, tpvosTraceRecord pRecord, v_U16_t recIndex)
{
- TLLOGE( VOS_TRACE (VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_ERROR,
- "%04d %012u S%-3d %-14s %-30s(0x%x)",
- recIndex, pRecord->time, pRecord->session, " TL Event: ",
- tlTraceGetEventString (pRecord->code), pRecord->data));
+ TLLOGE( VOS_TRACE (VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_INFO,
+ "%04d %012u S%-3d %-14s %-30s(0x%x)",
+ recIndex, pRecord->time, pRecord->session,
+ " TL Event: ",
+ tlTraceGetEventString (pRecord->code),
+ pRecord->data));
}
void tlTraceInit()
diff --git a/CORE/VOSS/src/vos_trace.c b/CORE/VOSS/src/vos_trace.c
index 6c91448..8c8beea 100755
--- a/CORE/VOSS/src/vos_trace.c
+++ b/CORE/VOSS/src/vos_trace.c
@@ -589,7 +589,7 @@
return;
}
- VOS_TRACE( VOS_MODULE_ID_SYS, VOS_TRACE_LEVEL_ERROR,
+ VOS_TRACE( VOS_MODULE_ID_SYS, VOS_TRACE_LEVEL_INFO,
"Total Records: %d, Head: %d, Tail: %d",
gvosTraceData.num, gvosTraceData.head, gvosTraceData.tail);