qcacld-3.0: Add QDF trace API's
Replace CDF trace API's with QDF trace API's.
Change-Id: I5b99dce73297f7de8f0755fa0b47dc3f84c78747
CRs-Fixed: 981188
diff --git a/core/mac/src/pe/include/lim_trace.h b/core/mac/src/pe/include/lim_trace.h
index 494edc8..dbd4ed7 100644
--- a/core/mac/src/pe/include/lim_trace.h
+++ b/core/mac/src/pe/include/lim_trace.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013-2015 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2013-2016 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -40,7 +40,7 @@
#include "lim_global.h"
#include "mac_trace.h"
-#include "cdf_trace.h"
+#include "qdf_trace.h"
#ifdef LIM_TRACE_RECORD
#define LIM_TRACE_GET_SSN(data) (((data) >> 16) & 0xff)
@@ -85,7 +85,7 @@
void lim_trace_dumpMgmtStat(tpAniSirGlobal pMac, uint8_t subtype);
uint8_t *lim_trace_get_mlm_state_string(uint32_t mlmState);
uint8_t *lim_trace_get_sme_state_string(uint32_t smeState);
-void lim_trace_dump(tpAniSirGlobal pMac, tp_cdf_trace_record pRecord,
+void lim_trace_dump(tpAniSirGlobal pMac, tp_qdf_trace_record pRecord,
uint16_t recIndex);
void mac_trace_msg_tx(tpAniSirGlobal pMac, uint8_t session, uint32_t data);
void mac_trace_msg_rx(tpAniSirGlobal pMac, uint8_t session, uint32_t data);
diff --git a/core/mac/src/pe/lim/lim_api.c b/core/mac/src/pe/lim/lim_api.c
index e62c655..4bdfe04 100644
--- a/core/mac/src/pe/lim/lim_api.c
+++ b/core/mac/src/pe/lim/lim_api.c
@@ -661,7 +661,7 @@
&pMac->lim.gLimMgmtFrameRegistratinQueue,
(qdf_list_node_t **) &pLimMgmtRegistration) ==
QDF_STATUS_SUCCESS) {
- CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO,
+ QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO,
FL("Fixing leak! Deallocating pLimMgmtRegistration node"));
cdf_mem_free(pLimMgmtRegistration);
}
@@ -1857,16 +1857,16 @@
if (roam_offload_synch_ind_ptr->beaconProbeRespLength <=
SIR_MAC_HDR_LEN_3A) {
- CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_ERROR, "%s: very"
+ QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_ERROR, "%s: very"
"few bytes in synchInd beacon / probe resp frame! length=%d",
__func__, roam_offload_synch_ind_ptr->beaconProbeRespLength);
cdf_mem_free(parsed_frm_ptr);
return QDF_STATUS_E_FAILURE;
}
- CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO,
+ QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO,
"LFR3:Beacon/Prb Rsp:%d", roam_offload_synch_ind_ptr->isBeacon);
- CDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO,
+ QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO,
bcn_proberesp_ptr, roam_offload_synch_ind_ptr->beaconProbeRespLength);
if (roam_offload_synch_ind_ptr->isBeacon) {
if (sir_parse_beacon_ie(pMac, parsed_frm_ptr,
@@ -1875,7 +1875,7 @@
roam_offload_synch_ind_ptr->beaconProbeRespLength -
SIR_MAC_HDR_LEN_3A) != eSIR_SUCCESS ||
!parsed_frm_ptr->ssidPresent) {
- CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_ERROR,
+ QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_ERROR,
"Parse error Beacon, length=%d",
roam_offload_synch_ind_ptr->beaconProbeRespLength);
cdf_mem_free(parsed_frm_ptr);
@@ -1887,7 +1887,7 @@
roam_offload_synch_ind_ptr->beaconProbeRespLength -
SIR_MAC_HDR_LEN_3A, parsed_frm_ptr) != eSIR_SUCCESS ||
!parsed_frm_ptr->ssidPresent) {
- CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_ERROR,
+ QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_ERROR,
"Parse error ProbeResponse, length=%d",
roam_offload_synch_ind_ptr->beaconProbeRespLength);
cdf_mem_free(parsed_frm_ptr);
@@ -1969,11 +1969,11 @@
(uint8_t *)parsed_frm_ptr->mdie,
SIR_MDIE_SIZE);
}
- CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_DEBUG,
+ QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG,
"LFR3:%s:BssDescr Info:", __func__);
- CDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_DEBUG,
+ QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG,
bss_desc_ptr->bssId, sizeof(tSirMacAddr));
- CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_DEBUG,
+ QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG,
"chan=%d, rssi=%d", bss_desc_ptr->channelId,
bss_desc_ptr->rssi);
if (ie_len) {
@@ -2015,10 +2015,10 @@
return status;
}
lim_log(mac_ctx, LOGE, FL("LFR3:Received WMA_ROAM_OFFLOAD_SYNCH_IND"));
- lim_log(mac_ctx, CDF_TRACE_LEVEL_DEBUG, FL("LFR3:auth=%d, vdevId=%d"),
+ lim_log(mac_ctx, QDF_TRACE_LEVEL_DEBUG, FL("LFR3:auth=%d, vdevId=%d"),
roam_sync_ind_ptr->authStatus, roam_sync_ind_ptr->roamedVdevId);
lim_print_mac_addr(mac_ctx, roam_sync_ind_ptr->bssid.bytes,
- CDF_TRACE_LEVEL_DEBUG);
+ QDF_TRACE_LEVEL_DEBUG);
session_ptr = pe_find_session_by_sme_session_id(mac_ctx,
roam_sync_ind_ptr->roamedVdevId);
if (session_ptr == NULL) {
@@ -2104,7 +2104,7 @@
mac_ctx->roam.reassocRespLen);
lim_log(mac_ctx, LOG1, FL("LFR3:the reassoc resp frame data:"));
- CDF_TRACE_HEX_DUMP(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO,
+ QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO,
mac_ctx->roam.pReassocResp,
mac_ctx->roam.reassocRespLen);
ft_session_ptr->bRoamSynchInProgress = true;
diff --git a/core/mac/src/pe/lim/lim_assoc_utils.c b/core/mac/src/pe/lim/lim_assoc_utils.c
index 3326796..43917d0 100644
--- a/core/mac/src/pe/lim/lim_assoc_utils.c
+++ b/core/mac/src/pe/lim/lim_assoc_utils.c
@@ -2816,7 +2816,7 @@
msg_q.bodyptr = add_sta_params;
msg_q.bodyval = 0;
- CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_DEBUG,
+ QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG,
"Sending WMA_ADD_STA_REQ (aid %d)",
add_sta_params->assocId);
MTRACE(mac_trace_msg_tx(mac_ctx, session_entry->peSessionId,
diff --git a/core/mac/src/pe/lim/lim_ft.c b/core/mac/src/pe/lim/lim_ft.c
index ea9da9d..2122371 100644
--- a/core/mac/src/pe/lim/lim_ft.c
+++ b/core/mac/src/pe/lim/lim_ft.c
@@ -125,8 +125,8 @@
if (pReAssocSessionEntry->valid &&
pReAssocSessionEntry->limSmeState ==
eLIM_SME_WT_REASSOC_STATE) {
- CDF_TRACE(QDF_MODULE_ID_PE,
- CDF_TRACE_LEVEL_DEBUG,
+ QDF_TRACE(QDF_MODULE_ID_PE,
+ QDF_TRACE_LEVEL_DEBUG,
FL("Deleting Preauth session(%d)"),
pReAssocSessionEntry->peSessionId);
pe_delete_session(pMac, pReAssocSessionEntry);
@@ -1062,7 +1062,7 @@
ft_pre_auth_rsp = (tpSirFTPreAuthRsp) cdf_mem_malloc(rsp_len);
if (NULL == ft_pre_auth_rsp) {
lim_log(mac_ctx, LOGE, "Failed to allocate memory");
- CDF_ASSERT(ft_pre_auth_rsp != NULL);
+ QDF_ASSERT(ft_pre_auth_rsp != NULL);
return;
}
cdf_mem_zero(ft_pre_auth_rsp, rsp_len);
diff --git a/core/mac/src/pe/lim/lim_ibss_peer_mgmt.c b/core/mac/src/pe/lim/lim_ibss_peer_mgmt.c
index 9a4a436..697532d 100644
--- a/core/mac/src/pe/lim/lim_ibss_peer_mgmt.c
+++ b/core/mac/src/pe/lim/lim_ibss_peer_mgmt.c
@@ -1354,7 +1354,7 @@
* we set IBSS state to inactive.
*/
if (0 == pMac->lim.gLimNumIbssPeers) {
- CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO,
+ QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO,
"Last STA from IBSS walked out");
psessionEntry->limIbssActive = false;
}
diff --git a/core/mac/src/pe/lim/lim_process_action_frame.c b/core/mac/src/pe/lim/lim_process_action_frame.c
index 8ef95cc..09b8334 100644
--- a/core/mac/src/pe/lim/lim_process_action_frame.c
+++ b/core/mac/src/pe/lim/lim_process_action_frame.c
@@ -1604,7 +1604,7 @@
pHdr = WMA_GET_RX_MAC_HEADER(pRxPacketInfo);
frameLen = WMA_GET_RX_PAYLOAD_LEN(pRxPacketInfo);
pBody = WMA_GET_RX_MPDU_DATA(pRxPacketInfo);
- CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO,
+ QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO,
("SA Query Response received..."));
/* When a station, supplicant handles SA Query Response.
@@ -2050,7 +2050,7 @@
mac_hdr = WMA_GET_RX_MAC_HEADER(rx_pkt_info);
frame_len = WMA_GET_RX_PAYLOAD_LEN(rx_pkt_info);
rssi = WMA_GET_RX_RSSI_NORMALIZED(rx_pkt_info);
- CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO,
+ QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO,
("Public Action TDLS Discovery RSP .."));
lim_send_sme_mgmt_frame_ind(mac_ctx,
mac_hdr->fc.subType, (uint8_t *) mac_hdr,
diff --git a/core/mac/src/pe/lim/lim_process_message_queue.c b/core/mac/src/pe/lim/lim_process_message_queue.c
index b3e17ba..7cd2a9d 100644
--- a/core/mac/src/pe/lim/lim_process_message_queue.c
+++ b/core/mac/src/pe/lim/lim_process_message_queue.c
@@ -261,7 +261,7 @@
if (pMac->lim.gLimSmeState == eLIM_SME_OFFLINE_STATE) {
/* Defer processsing this message */
if (lim_defer_msg(pMac, limMsg) != TX_SUCCESS) {
- CDF_TRACE(QDF_MODULE_ID_PE, LOGE,
+ QDF_TRACE(QDF_MODULE_ID_PE, LOGE,
FL("Unable to Defer Msg"));
lim_log_session_states(pMac);
lim_handle_defer_msg_error(pMac, limMsg);
@@ -316,7 +316,7 @@
)
/* Defer processsing this message */
if (lim_defer_msg(pMac, limMsg) != TX_SUCCESS) {
- CDF_TRACE(QDF_MODULE_ID_PE, LOGE,
+ QDF_TRACE(QDF_MODULE_ID_PE, LOGE,
FL("Unable to Defer Msg"));
lim_log_session_states(pMac);
lim_handle_defer_msg_error(pMac, limMsg);
@@ -598,12 +598,12 @@
mac_hdr = WMA_GET_RX_MPDUHEADER3A(rx_pkt_buffer);
if (lim_is_group_addr(mac_hdr->addr2)) {
- CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO_HIGH,
+ QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO_HIGH,
FL("Ignoring A2 Invalid Packet received for MC/BC:"));
lim_print_mac_addr(mac_ctx, mac_hdr->addr2, LOG2);
return;
}
- CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO,
+ QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO,
FL("type=0x%x, subtype=0x%x"),
mac_hdr->fc.type, mac_hdr->fc.subType);
/* Currently only following type and subtype are handled.
@@ -663,7 +663,7 @@
if ((type == SIR_MAC_MGMT_FRAME)
&& (fc.type == SIR_MAC_MGMT_FRAME)
&& (sub_type == SIR_MAC_MGMT_RESERVED15)) {
- CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO_HIGH,
+ QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO_HIGH,
FL
("rcvd frm match for SIR_MAC_MGMT_RESERVED15"));
match = true;
@@ -695,7 +695,7 @@
}
if (match) {
- CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO,
+ QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO,
FL("rcvd frame match with registered frame params"));
/* Indicate this to SME */
lim_send_sme_mgmt_frame_ind(mac_ctx, hdr->fc.subType,
@@ -761,7 +761,7 @@
FL("ProtVersion %d, Type %d, Subtype %d rateIndex=%d"),
fc.protVer, fc.type, fc.subType,
WMA_GET_RX_MAC_RATE_IDX(pRxPacketInfo));
- CDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_ERROR, pHdr,
+ QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_ERROR, pHdr,
WMA_GET_RX_MPDU_HEADER_LEN(pRxPacketInfo));
#endif
if (pMac->fEnableDebugLog & 0x1) {
@@ -1194,7 +1194,7 @@
}
if (msg == NULL) {
lim_log(mac_ctx, LOGE, FL("Message pointer is Null"));
- CDF_ASSERT(0);
+ QDF_ASSERT(0);
return;
}
#ifdef WLAN_DEBUG
@@ -1218,7 +1218,7 @@
*/
if (lim_defer_msg(mac_ctx, msg) != TX_SUCCESS) {
if (!(mac_ctx->lim.deferredMsgCnt & 0xF))
- CDF_TRACE(QDF_MODULE_ID_PE, LOGE,
+ QDF_TRACE(QDF_MODULE_ID_PE, LOGE,
FL("Unable to Defer Msg"));
lim_log_session_states(mac_ctx);
lim_print_msg_name(mac_ctx, LOGE, msg->type);
@@ -1253,7 +1253,7 @@
*/
if (msg->bodyptr == NULL) {
lim_log(mac_ctx, LOGE, FL("Message bodyptr is Null"));
- CDF_ASSERT(0);
+ QDF_ASSERT(0);
break;
}
cdf_mem_copy((uint8_t *) &new_msg,
@@ -1280,10 +1280,10 @@
lim_handle80211_frames(mac_ctx, &new_msg, &defer_msg);
if (defer_msg == true) {
- CDF_TRACE(QDF_MODULE_ID_PE, LOG1,
+ QDF_TRACE(QDF_MODULE_ID_PE, LOG1,
FL("Defer Msg type=%x"), msg->type);
if (lim_defer_msg(mac_ctx, msg) != TX_SUCCESS) {
- CDF_TRACE(QDF_MODULE_ID_PE, LOGE,
+ QDF_TRACE(QDF_MODULE_ID_PE, LOGE,
FL("Unable to Defer Msg"));
lim_log_session_states(mac_ctx);
cds_pkt_return_packet(body_ptr);
@@ -1410,7 +1410,7 @@
qdf_status =
session_entry->p2pGoPsNoaStartInd.status;
if (qdf_status != QDF_STATUS_SUCCESS)
- CDF_TRACE(QDF_MODULE_ID_PE, LOGW,
+ QDF_TRACE(QDF_MODULE_ID_PE, LOGW,
FL(
"GO NOA start status %d by FW"),
qdf_status);
@@ -1419,7 +1419,7 @@
}
if (p2p_go_exists == 0)
- CDF_TRACE(QDF_MODULE_ID_PE, LOGW,
+ QDF_TRACE(QDF_MODULE_ID_PE, LOGW,
FL(
"GO is removed by the time NOA start recvd"));
@@ -1600,7 +1600,7 @@
case SIR_HAL_TDLS_SHOULD_DISCOVER:
case SIR_HAL_TDLS_SHOULD_TEARDOWN:
case SIR_HAL_TDLS_PEER_DISCONNECTED:
- CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO,
+ QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO,
("%s received tdls event: 0x%x"), __func__, msg->type);
lim_send_sme_tdls_event_notify(mac_ctx, msg->type,
(void *)msg->bodyptr);
@@ -2080,10 +2080,10 @@
for (i = 0; i < mac_ctx->lim.maxBssId; i++) {
if (mac_ctx->lim.gpSession[i].valid) {
- CDF_TRACE(QDF_MODULE_ID_PE, LOG1,
+ QDF_TRACE(QDF_MODULE_ID_PE, LOG1,
FL("sysRole(%d) Session (%d)"),
mac_ctx->lim.gLimSystemRole, i);
- CDF_TRACE(QDF_MODULE_ID_PE, LOG1,
+ QDF_TRACE(QDF_MODULE_ID_PE, LOG1,
FL("SME: Curr %s,Prev %s,MLM: Curr %s,Prev %s"),
lim_sme_state_str(
mac_ctx->lim.gpSession[i].limSmeState),
diff --git a/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c b/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c
index 04edc0c..9ec47dc 100644
--- a/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c
+++ b/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c
@@ -302,7 +302,7 @@
(cds_get_channel_state(channelId) !=
CHANNEL_STATE_DFS))) {
/* Configure beacon and send beacons to HAL */
- CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO,
+ QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO,
FL("Start Beacon with ssid %s Ch %d"),
psessionEntry->ssId.ssId,
psessionEntry->currentOperChannel);
@@ -840,7 +840,7 @@
#ifdef WLAN_FEATURE_ROAM_OFFLOAD
if (session->bRoamSynchInProgress) {
- CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_DEBUG,
+ QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG,
FL("LFR3:Re-set the LIM Ctxt Roam Synch In Progress"));
session->bRoamSynchInProgress = false;
}
@@ -850,7 +850,7 @@
lim_mlm_reassoc_cnf->resultCode);
if (lim_mlm_reassoc_cnf->resultCode == eSIR_SME_SUCCESS) {
/* Successful Reassociation */
- CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_DEBUG,
+ QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG,
FL("*** Reassociated with new BSS ***"));
session->limSmeState = eLIM_SME_LINK_EST_STATE;
@@ -2752,7 +2752,7 @@
psessionEntry);
#ifdef WLAN_FEATURE_ROAM_OFFLOAD
} else {
- CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_DEBUG,
+ QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG,
"LFR3:Do not activate timer and dont send the reassoc req");
}
#endif
@@ -2876,7 +2876,7 @@
}
#ifdef WLAN_FEATURE_ROAM_OFFLOAD
if (psessionEntry->bRoamSynchInProgress) {
- CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_DEBUG,
+ QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG,
"LFR3:Prepare and save pAddStaReq in pMac for post-assoc-rsp");
lim_process_assoc_rsp_frame(pMac, pMac->roam.pReassocResp,
LIM_REASSOC, psessionEntry);
@@ -2976,7 +2976,7 @@
goto end;
#ifdef WLAN_FEATURE_ROAM_OFFLOAD
if (session_entry->bRoamSynchInProgress)
- CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_DEBUG,
+ QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG,
"LFR3:lim_process_sta_mlm_add_bss_rsp");
#endif
@@ -4132,7 +4132,7 @@
if (!QDF_IS_STATUS_SUCCESS
(cds_mq_post_message(QDF_MODULE_ID_WMA, &msg)))
- CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+ QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
"%s: Not able to post WMA_SME_SCAN_CACHE_UPDATED message to WMA",
__func__);
}
@@ -4154,7 +4154,7 @@
{
tSirScanOffloadEvent *pScanEvent = (tSirScanOffloadEvent *) buf;
- CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO,
+ QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO,
"scan_id = %u, scan_requestor_id 0x%x", pScanEvent->scanId,
pScanEvent->requestor);
switch (pScanEvent->event) {
@@ -4212,7 +4212,7 @@
case SCAN_EVENT_DEQUEUED:
case SCAN_EVENT_PREEMPTED:
default:
- CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_DEBUG,
+ QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG,
"Received unhandled scan event %u",
pScanEvent->event);
}
diff --git a/core/mac/src/pe/lim/lim_process_probe_rsp_frame.c b/core/mac/src/pe/lim/lim_process_probe_rsp_frame.c
index 911b59f..195e223 100644
--- a/core/mac/src/pe/lim/lim_process_probe_rsp_frame.c
+++ b/core/mac/src/pe/lim/lim_process_probe_rsp_frame.c
@@ -125,7 +125,7 @@
}
frame_len = WMA_GET_RX_PAYLOAD_LEN(rx_Packet_info);
- CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO,
+ QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO,
FL("Probe Resp Frame Received: BSSID "
MAC_ADDRESS_STR " (RSSI %d)"),
MAC_ADDR_ARRAY(header->bssId),
@@ -345,7 +345,7 @@
}
frame_len = WMA_GET_RX_PAYLOAD_LEN(rx_packet_info);
- CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO,
+ QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO,
FL("Probe Resp Frame Received: BSSID "
MAC_ADDRESS_STR " (RSSI %d)"),
MAC_ADDR_ARRAY(header->bssId),
diff --git a/core/mac/src/pe/lim/lim_process_sme_req_messages.c b/core/mac/src/pe/lim/lim_process_sme_req_messages.c
index 60cd82f..99b5795 100644
--- a/core/mac/src/pe/lim/lim_process_sme_req_messages.c
+++ b/core/mac/src/pe/lim/lim_process_sme_req_messages.c
@@ -694,7 +694,7 @@
/* Store Persona */
session->pePersona = sme_start_bss_req->bssPersona;
- CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO,
+ QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO,
FL("PE PERSONA=%d"), session->pePersona);
/* Update the phymode */
@@ -713,7 +713,7 @@
IS_DOT11_MODE_HT(session->dot11mode);
session->vhtCapability =
IS_DOT11_MODE_VHT(session->dot11mode);
- CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO,
+ QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO,
FL("*****session->vhtCapability = %d"),
session->vhtCapability);
session->txLdpcIniFeatureEnabled =
@@ -820,7 +820,7 @@
sme_start_bss_req->sec_ch_offset;
session->htRecommendedTxWidthSet =
(session->htSecondaryChannelOffset) ? 1 : 0;
- CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO,
+ QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO,
FL("cbMode %u"), sme_start_bss_req->cbMode);
if (session->vhtCapability || session->htCapability) {
chanwidth = sme_start_bss_req->vht_channel_width;
@@ -1692,7 +1692,7 @@
/*Store Persona */
session->pePersona = sme_join_req->staPersona;
- CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO,
+ QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO,
FL("PE PERSONA=%d cbMode %u"),
session->pePersona, sme_join_req->cbMode);
if (mac_ctx->roam.configParam.enable2x2)
@@ -1702,7 +1702,7 @@
#ifdef WLAN_FEATURE_11AC
session->vhtCapability =
IS_DOT11_MODE_VHT(session->dot11mode);
- CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO_MED,
+ QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO_MED,
"***__lim_process_sme_join_req: vhtCapability=%d****",
session->vhtCapability);
if (session->vhtCapability) {
@@ -1718,7 +1718,7 @@
session->enableVhtGid =
sme_join_req->enableVhtGid;
- CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO_MED,
+ QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO_MED,
FL("***txBFIniFeatureEnabled=%d***"),
session->txBFIniFeatureEnabled);
if (wlan_cfg_get_int(mac_ctx,
@@ -1743,7 +1743,7 @@
ret_code = eSIR_LOGP_EXCEPTION;
goto end;
}
- CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO_MED,
+ QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO_MED,
"%s: txBFCsnValue=%d", __func__,
sme_join_req->txBFCsnValue);
session->txbf_csn_value = sme_join_req->txBFCsnValue;
@@ -3414,7 +3414,7 @@
} else {
lim_log(pMac, LOGE,
FL("lim_del_sta failed with Status : %d"), status);
- CDF_ASSERT(0);
+ QDF_ASSERT(0);
}
}
/* send a delBss to HAL and wait for a response */
@@ -4998,7 +4998,7 @@
* Tx right after the WMA_ADD_BSS_RSP.
*/
lim_apply_configuration(pMac, psessionEntry);
- CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO,
+ QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO,
FL("Start Beacon with ssid %s Ch %d"),
psessionEntry->ssId.ssId,
psessionEntry->currentOperChannel);
@@ -5263,8 +5263,8 @@
case eUPDATE_IE_ASSOC_RESP:
/* assoc resp IE */
if (add_ie_params->assocRespDataLen == 0) {
- CDF_TRACE(QDF_MODULE_ID_PE,
- CDF_TRACE_LEVEL_ERROR, FL(
+ QDF_TRACE(QDF_MODULE_ID_PE,
+ QDF_TRACE_LEVEL_ERROR, FL(
"assoc resp add ie not present %d"),
add_ie_params->assocRespDataLen);
}
diff --git a/core/mac/src/pe/lim/lim_process_tdls.c b/core/mac/src/pe/lim/lim_process_tdls.c
index ed749a9..c4653be 100644
--- a/core/mac/src/pe/lim/lim_process_tdls.c
+++ b/core/mac/src/pe/lim/lim_process_tdls.c
@@ -2417,7 +2417,7 @@
if (NULL == pStaDs) {
lim_log(pMac, LOGE, FL("add hash entry failed"));
- CDF_ASSERT(0);
+ QDF_ASSERT(0);
return eSIR_FAILURE;
}
}
@@ -2433,7 +2433,7 @@
if (eSIR_SUCCESS != status) {
/* should not fail */
- CDF_ASSERT(0);
+ QDF_ASSERT(0);
}
return status;
}
@@ -2529,7 +2529,7 @@
MAC_ADDR_ARRAY(pAddStaParams->staMac));
if (pAddStaParams->status != QDF_STATUS_SUCCESS) {
- CDF_ASSERT(0);
+ QDF_ASSERT(0);
lim_log(pMac, LOGE, FL("Add sta failed "));
status = eSIR_FAILURE;
goto add_sta_error;
@@ -2754,7 +2754,7 @@
/* check if we are in proper state to work as TDLS client */
if (!LIM_IS_STA_ROLE(session_entry)) {
- CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_ERROR,
+ QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_ERROR,
FL("send mgmt received in wrong system Role %d"),
GET_LIM_SYSTEM_ROLE(session_entry));
goto lim_tdls_send_mgmt_error;
@@ -2937,7 +2937,7 @@
/* check if we are in proper state to work as TDLS client */
if (!LIM_IS_STA_ROLE(psessionEntry)) {
- CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_ERROR,
+ QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_ERROR,
"send mgmt received in wrong system Role %d",
GET_LIM_SYSTEM_ROLE(psessionEntry));
goto lim_tdls_add_sta_error;
@@ -3005,7 +3005,7 @@
/* check if we are in proper state to work as TDLS client */
if (!LIM_IS_STA_ROLE(psessionEntry)) {
- CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_ERROR,
+ QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_ERROR,
"Del sta received in wrong system Role %d",
GET_LIM_SYSTEM_ROLE(psessionEntry));
goto lim_tdls_del_sta_error;
@@ -3103,13 +3103,13 @@
uint32_t self_num_chan = WNI_CFG_VALID_CHANNEL_LIST_LEN;
uint8_t self_supp_chan[WNI_CFG_VALID_CHANNEL_LIST_LEN];
- CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO,
+ QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO,
FL("Send Mgmt Recieved"));
session_entry = pe_find_session_by_bssid(mac_ctx, tdls_req->bssid.bytes,
&session_id);
if (NULL == session_entry) {
- CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_ERROR,
+ QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_ERROR,
FL("PE Session does not exist for sme session_id %d"),
tdls_req->sessionId);
lim_send_sme_tdls_link_establish_req_rsp(mac_ctx,
@@ -3120,7 +3120,7 @@
/* check if we are in proper state to work as TDLS client */
if (!LIM_IS_STA_ROLE(session_entry)) {
- CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_ERROR,
+ QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_ERROR,
FL("TDLS Link Establish Request received in wrong system Role %d"),
GET_LIM_SYSTEM_ROLE(session_entry));
goto lim_tdls_link_establish_error;
diff --git a/core/mac/src/pe/lim/lim_prop_exts_utils.c b/core/mac/src/pe/lim/lim_prop_exts_utils.c
index 5fcf9ba..ac882ae 100644
--- a/core/mac/src/pe/lim/lim_prop_exts_utils.c
+++ b/core/mac/src/pe/lim/lim_prop_exts_utils.c
@@ -117,11 +117,11 @@
mac_ctx->lim.htCapabilityPresentInBeacon = 0;
#ifdef WLAN_FEATURE_11AC
- CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO_MED,
+ QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO_MED,
"beacon.VHTCaps.present = %d BSS_VHT_Capable:%d",
beacon_struct->VHTCaps.present,
IS_BSS_VHT_CAPABLE(beacon_struct->VHTCaps));
- CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO_MED,
+ QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO_MED,
"***beacon.SU Beamformer Capable*****=%d",
beacon_struct->VHTCaps.suBeamFormerCap);
diff --git a/core/mac/src/pe/lim/lim_scan_result_utils.c b/core/mac/src/pe/lim/lim_scan_result_utils.c
index 283649f..2bc0f20 100644
--- a/core/mac/src/pe/lim/lim_scan_result_utils.c
+++ b/core/mac/src/pe/lim/lim_scan_result_utils.c
@@ -98,7 +98,7 @@
pHdr = WMA_GET_RX_MAC_HEADER(pRxPacketInfo);
if (SIR_MAC_B_PR_SSID_OFFSET > WMA_GET_RX_PAYLOAD_LEN(pRxPacketInfo)) {
- CDF_ASSERT(WMA_GET_RX_PAYLOAD_LEN(pRxPacketInfo) >=
+ QDF_ASSERT(WMA_GET_RX_PAYLOAD_LEN(pRxPacketInfo) >=
SIR_MAC_B_PR_SSID_OFFSET);
return QDF_STATUS_E_FAILURE;
}
diff --git a/core/mac/src/pe/lim/lim_send_management_frames.c b/core/mac/src/pe/lim/lim_send_management_frames.c
index b108064..bc12d9a 100644
--- a/core/mac/src/pe/lim/lim_send_management_frames.c
+++ b/core/mac/src/pe/lim/lim_send_management_frames.c
@@ -57,7 +57,7 @@
#endif
#include "lim_session.h"
#include "qdf_types.h"
-#include "cdf_trace.h"
+#include "qdf_trace.h"
#include "cds_utils.h"
#include "sme_trace.h"
#if defined WLAN_FEATURE_VOWIFI
@@ -556,7 +556,7 @@
if (((pe_session->pePersona == QDF_SAP_MODE) ||
(pe_session->pePersona == QDF_P2P_GO_MODE)) &&
(true == mac_ctx->sap.SapDfsInfo.is_dfs_cac_timer_running)) {
- CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO,
+ QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO,
FL("CAC timer is running, probe response dropped"));
return;
}
@@ -1065,7 +1065,7 @@
txFlag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME;
}
- MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
+ MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
psessionEntry->peSessionId, pMacHdr->fc.subType));
/* Queue Addts Response frame in high priority WQ */
@@ -1074,7 +1074,7 @@
ANI_TXDIR_TODS,
7, lim_tx_complete, pFrame, txFlag,
smeSessionId, 0);
- MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE,
+ MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE,
psessionEntry->peSessionId, qdf_status));
if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
@@ -1388,7 +1388,7 @@
(pe_session->pePersona == QDF_P2P_GO_MODE))
tx_flag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME;
- MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
+ MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
pe_session->peSessionId, mac_hdr->fc.subType));
/* Queue Association Response frame in high priority WQ */
qdf_status = wma_tx_frame(mac_ctx, packet, (uint16_t) bytes,
@@ -1396,7 +1396,7 @@
ANI_TXDIR_TODS,
7, lim_tx_complete, frame, tx_flag,
sme_session, 0);
- MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE,
+ MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE,
pe_session->peSessionId, qdf_status));
/* Pkt will be freed up by the callback */
@@ -1552,14 +1552,14 @@
txFlag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME;
}
- MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
+ MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
psessionEntry->peSessionId, pMacHdr->fc.subType));
qdf_status = wma_tx_frame(pMac, pPacket, (uint16_t) nBytes,
TXRX_FRM_802_11_MGMT,
ANI_TXDIR_TODS,
7, lim_tx_complete, pFrame, txFlag,
smeSessionId, 0);
- MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE,
+ MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE,
psessionEntry->peSessionId, qdf_status));
/* Pkt will be freed up by the callback */
if (!QDF_IS_STATUS_SUCCESS(qdf_status))
@@ -1867,7 +1867,7 @@
bytes);
pe_session->limMlmState = pe_session->limPrevMlmState;
- MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_MLM_STATE,
+ MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_MLM_STATE,
pe_session->peSessionId,
pe_session->limMlmState));
@@ -1950,14 +1950,14 @@
pe_session, eSIR_SUCCESS, eSIR_SUCCESS);
#endif
mac_hdr = (tpSirMacMgmtHdr) frame;
- MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
+ MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
pe_session->peSessionId, mac_hdr->fc.subType));
qdf_status =
wma_tx_frame(mac_ctx, packet,
(uint16_t) (sizeof(tSirMacMgmtHdr) + payload),
TXRX_FRM_802_11_MGMT, ANI_TXDIR_TODS, 7,
lim_tx_complete, frame, tx_flag, sme_sessionid, 0);
- MTRACE(cdf_trace
+ MTRACE(qdf_trace
(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE,
pe_session->peSessionId, qdf_status));
if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
@@ -2279,7 +2279,7 @@
(void **)&frame, (void **)&packet);
if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
pe_session->limMlmState = pe_session->limPrevMlmState;
- MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_MLM_STATE,
+ MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_MLM_STATE,
pe_session->peSessionId,
pe_session->limMlmState));
lim_log(mac_ctx, LOGP, FL("Failed to alloc memory %d"), bytes);
@@ -2384,14 +2384,14 @@
lim_diag_event_report(mac_ctx, WLAN_PE_DIAG_REASSOC_START_EVENT,
pe_session, eSIR_SUCCESS, eSIR_SUCCESS);
#endif
- MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
+ MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
pe_session->peSessionId, mac_hdr->fc.subType));
qdf_status = wma_tx_frame(mac_ctx, packet,
(uint16_t) (bytes + ft_ies_length),
TXRX_FRM_802_11_MGMT, ANI_TXDIR_TODS, 7,
lim_tx_complete, frame, tx_flag, sme_sessionid,
0);
- MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE,
+ MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE,
pe_session->peSessionId, qdf_status));
if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
lim_log(mac_ctx, LOGE,
@@ -2425,7 +2425,7 @@
pMac->lim.limTimers.gLimReassocFailureTimer.sessionId =
psessionEntry->peSessionId;
/* Start reassociation failure timer */
- MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TIMER_ACTIVATE,
+ MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TIMER_ACTIVATE,
psessionEntry->peSessionId, eLIM_REASSOC_FAIL_TIMER));
if (tx_timer_activate(&pMac->lim.limTimers.gLimReassocFailureTimer)
!= TX_SUCCESS) {
@@ -2645,7 +2645,7 @@
(void **)&pPacket);
if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
psessionEntry->limMlmState = psessionEntry->limPrevMlmState;
- MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_MLM_STATE,
+ MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_MLM_STATE,
psessionEntry->peSessionId,
psessionEntry->limMlmState));
lim_log(pMac, LOGP,
@@ -2720,14 +2720,14 @@
lim_diag_event_report(pMac, WLAN_PE_DIAG_REASSOC_START_EVENT,
psessionEntry, eSIR_SUCCESS, eSIR_SUCCESS);
#endif
- MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
+ MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
psessionEntry->peSessionId, pMacHdr->fc.subType));
qdf_status =
wma_tx_frame(pMac, pPacket,
(uint16_t) (sizeof(tSirMacMgmtHdr) + nPayload),
TXRX_FRM_802_11_MGMT, ANI_TXDIR_TODS, 7,
lim_tx_complete, pFrame, txFlag, smeSessionId, 0);
- MTRACE(cdf_trace
+ MTRACE(qdf_trace
(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE,
psessionEntry->peSessionId, qdf_status));
if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
@@ -3016,14 +3016,14 @@
session->pePersona == QDF_STA_MODE)
tx_flag |= HAL_USE_PEER_STA_REQUESTED_MASK;
- MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
+ MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
session->peSessionId, mac_hdr->fc.subType));
/* Queue Authentication frame in high priority WQ */
qdf_status = wma_tx_frame(mac_ctx, packet, (uint16_t) frame_len,
TXRX_FRM_802_11_MGMT,
ANI_TXDIR_TODS, 7, lim_tx_complete,
frame, tx_flag, sme_sessionid, 0);
- MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE,
+ MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE,
session->peSessionId, qdf_status));
if (!QDF_IS_STATUS_SUCCESS(qdf_status))
lim_log(mac_ctx, LOGE,
@@ -3293,7 +3293,7 @@
if (((psessionEntry->pePersona == QDF_SAP_MODE) ||
(psessionEntry->pePersona == QDF_P2P_GO_MODE)) &&
(true == pMac->sap.SapDfsInfo.is_dfs_cac_timer_running)) {
- CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO,
+ QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO,
FL
("CAC timer is running, drop disassoc from going out"));
return;
@@ -3372,7 +3372,7 @@
txFlag |= HAL_USE_PEER_STA_REQUESTED_MASK;
if (waitForAck) {
- MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
+ MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
psessionEntry->peSessionId,
pMacHdr->fc.subType));
/* Queue Disassociation frame in high priority WQ */
@@ -3383,7 +3383,7 @@
ANI_TXDIR_TODS, 7, lim_tx_complete,
pFrame, lim_disassoc_tx_complete_cnf,
txFlag, smeSessionId, false, 0);
- MTRACE(cdf_trace
+ MTRACE(qdf_trace
(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE,
psessionEntry->peSessionId, qdf_status));
@@ -3405,7 +3405,7 @@
return;
}
} else {
- MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
+ MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
psessionEntry->peSessionId,
pMacHdr->fc.subType));
/* Queue Disassociation frame in high priority WQ */
@@ -3415,7 +3415,7 @@
7,
lim_tx_complete, pFrame, txFlag,
smeSessionId, 0);
- MTRACE(cdf_trace
+ MTRACE(qdf_trace
(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE,
psessionEntry->peSessionId, qdf_status));
if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
@@ -3472,7 +3472,7 @@
if (((psessionEntry->pePersona == QDF_SAP_MODE) ||
(psessionEntry->pePersona == QDF_P2P_GO_MODE)) &&
(true == pMac->sap.SapDfsInfo.is_dfs_cac_timer_running)) {
- CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO,
+ QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO,
FL
("CAC timer is running, drop the deauth from going out"));
return;
@@ -3554,7 +3554,7 @@
#endif
if (waitForAck) {
- MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
+ MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
psessionEntry->peSessionId,
pMacHdr->fc.subType));
/* Queue Disassociation frame in high priority WQ */
@@ -3564,7 +3564,7 @@
ANI_TXDIR_TODS, 7, lim_tx_complete,
pFrame, lim_deauth_tx_complete_cnf,
txFlag, smeSessionId, false, 0);
- MTRACE(cdf_trace
+ MTRACE(qdf_trace
(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE,
psessionEntry->peSessionId, qdf_status));
/* Pkt will be freed up by the callback lim_tx_complete */
@@ -3598,7 +3598,7 @@
return;
}
} else {
- MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
+ MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
psessionEntry->peSessionId,
pMacHdr->fc.subType));
#ifdef FEATURE_WLAN_TDLS
@@ -3621,7 +3621,7 @@
#ifdef FEATURE_WLAN_TDLS
}
#endif
- MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE,
+ MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE,
psessionEntry->peSessionId, qdf_status));
if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
lim_log(pMac, LOGE,
@@ -3745,14 +3745,14 @@
"easurement Report (0x%08x)."), nStatus);
}
- MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
+ MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
((psessionEntry) ? psessionEntry->
peSessionId : NO_SESSION), pMacHdr->fc.subType));
qdf_status =
wma_tx_frame(pMac, pPacket, (uint16_t) nBytes,
TXRX_FRM_802_11_MGMT, ANI_TXDIR_TODS, 7,
lim_tx_complete, pFrame, 0, 0);
- MTRACE(cdf_trace
+ MTRACE(qdf_trace
(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE,
((psessionEntry) ? psessionEntry->peSessionId : NO_SESSION),
qdf_status));
@@ -3848,14 +3848,14 @@
"PC Request (0x%08x)."), nStatus);
}
- MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
+ MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
((psessionEntry) ? psessionEntry->
peSessionId : NO_SESSION), pMacHdr->fc.subType));
qdf_status =
wma_tx_frame(pMac, pPacket, (uint16_t) nBytes,
TXRX_FRM_802_11_MGMT, ANI_TXDIR_TODS, 7,
lim_tx_complete, pFrame, 0, 0);
- MTRACE(cdf_trace
+ MTRACE(qdf_trace
(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE,
((psessionEntry) ? psessionEntry->peSessionId : NO_SESSION),
qdf_status));
@@ -3955,14 +3955,14 @@
"PC Report (0x%08x)."), nStatus);
}
- MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
+ MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
((psessionEntry) ? psessionEntry->
peSessionId : NO_SESSION), pMacHdr->fc.subType));
qdf_status =
wma_tx_frame(pMac, pPacket, (uint16_t) nBytes,
TXRX_FRM_802_11_MGMT, ANI_TXDIR_TODS, 7,
lim_tx_complete, pFrame, 0, 0);
- MTRACE(cdf_trace
+ MTRACE(qdf_trace
(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE,
((psessionEntry) ? psessionEntry->peSessionId : NO_SESSION),
qdf_status));
@@ -4089,14 +4089,14 @@
txFlag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME;
}
- MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
+ MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
psessionEntry->peSessionId, pMacHdr->fc.subType));
qdf_status = wma_tx_frame(pMac, pPacket, (uint16_t) nBytes,
TXRX_FRM_802_11_MGMT,
ANI_TXDIR_TODS,
7, lim_tx_complete, pFrame, txFlag,
smeSessionId, 0);
- MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE,
+ MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE,
psessionEntry->peSessionId, qdf_status));
if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
lim_log(pMac, LOGE,
@@ -4223,7 +4223,7 @@
frm.ext_chan_switch_ann_action.new_channel,
frm.ext_chan_switch_ann_action.op_class);
- MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
+ MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
session_entry->peSessionId, mac_hdr->fc.subType));
qdf_status = wma_tx_frame(mac_ctx, packet, (uint16_t) num_bytes,
TXRX_FRM_802_11_MGMT,
@@ -4231,7 +4231,7 @@
7,
lim_tx_complete, frame,
txFlag, sme_session_id, 0);
- MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE,
+ MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE,
session_entry->peSessionId, qdf_status));
if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
lim_log(mac_ctx, LOGE,
@@ -4332,14 +4332,14 @@
txFlag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME;
}
- MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
+ MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
psessionEntry->peSessionId, pMacHdr->fc.subType));
qdf_status = wma_tx_frame(pMac, pPacket, (uint16_t) nBytes,
TXRX_FRM_802_11_MGMT,
ANI_TXDIR_TODS,
7, lim_tx_complete, pFrame, txFlag,
smeSessionId, 0);
- MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE,
+ MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE,
psessionEntry->peSessionId, qdf_status));
if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
lim_log(pMac, LOGE,
@@ -4476,7 +4476,7 @@
txFlag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME;
}
- MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
+ MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
psessionEntry->peSessionId, pMacHdr->fc.subType));
qdf_status = wma_tx_frame(pMac,
pPacket,
@@ -4485,7 +4485,7 @@
ANI_TXDIR_TODS,
7, lim_tx_complete, pFrame, txFlag,
smeSessionId, 0);
- MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE,
+ MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE,
psessionEntry->peSessionId, qdf_status));
if (QDF_STATUS_SUCCESS != qdf_status) {
PELOGE(lim_log
@@ -4633,7 +4633,7 @@
txFlag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME;
}
- MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
+ MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
psessionEntry->peSessionId, pMacHdr->fc.subType));
qdf_status = wma_tx_frame(pMac,
pPacket,
@@ -4642,7 +4642,7 @@
ANI_TXDIR_TODS,
7, lim_tx_complete, pFrame, txFlag,
smeSessionId, 0);
- MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE,
+ MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE,
psessionEntry->peSessionId, qdf_status));
if (QDF_STATUS_SUCCESS != qdf_status) {
PELOGE(lim_log
@@ -4828,7 +4828,7 @@
txFlag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME;
}
- MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
+ MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
psessionEntry->peSessionId, pMacHdr->fc.subType));
qdf_status = wma_tx_frame(pMac,
pPacket,
@@ -4837,7 +4837,7 @@
ANI_TXDIR_TODS,
7, lim_tx_complete, pFrame, txFlag,
smeSessionId, 0);
- MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE,
+ MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE,
psessionEntry->peSessionId, qdf_status));
if (QDF_STATUS_SUCCESS != qdf_status) {
PELOGE(lim_log
@@ -5116,7 +5116,7 @@
txFlag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME;
}
- MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
+ MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
psessionEntry->peSessionId, pMacHdr->fc.subType));
qdf_status = wma_tx_frame(pMac,
pPacket,
@@ -5125,7 +5125,7 @@
ANI_TXDIR_TODS,
7, lim_tx_complete, pFrame, txFlag,
smeSessionId, 0);
- MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE,
+ MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE,
psessionEntry->peSessionId, qdf_status));
if (QDF_STATUS_SUCCESS != qdf_status) {
PELOGE(lim_log
diff --git a/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c b/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c
index f793449..4924801 100644
--- a/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c
+++ b/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c
@@ -91,7 +91,7 @@
sme_rsp = cdf_mem_malloc(sizeof(tSirSmeRsp));
if (NULL == sme_rsp) {
/* Buffer not available. Log error */
- CDF_TRACE(QDF_MODULE_ID_PE, LOGP,
+ QDF_TRACE(QDF_MODULE_ID_PE, LOGP,
FL("call to AllocateMemory failed for eWNI_SME_*_RSP"));
return;
}
@@ -149,7 +149,7 @@
sme_rsp = cdf_mem_malloc(sizeof(struct sir_roc_rsp));
if (NULL == sme_rsp) {
- CDF_TRACE(QDF_MODULE_ID_PE, LOGP,
+ QDF_TRACE(QDF_MODULE_ID_PE, LOGP,
FL("call to AllocateMemory failed for eWNI_SME_*_RSP"));
return;
}
diff --git a/core/mac/src/pe/lim/lim_session.c b/core/mac/src/pe/lim/lim_session.c
index 02e5b20..c2e5dc0 100644
--- a/core/mac/src/pe/lim/lim_session.c
+++ b/core/mac/src/pe/lim/lim_session.c
@@ -114,8 +114,8 @@
bool bcn_prms_changed = false;
if (pe_session_entry->valid == false) {
- CDF_TRACE(QDF_MODULE_ID_PE,
- CDF_TRACE_LEVEL_ERROR,
+ QDF_TRACE(QDF_MODULE_ID_PE,
+ QDF_TRACE_LEVEL_ERROR,
FL("session already deleted. exiting timer callback"));
return;
}
@@ -127,8 +127,8 @@
pe_session_entry->gLimOverlapNonGfParams.protectionEnabled << 3 |
pe_session_entry->gLimOlbcParams.protectionEnabled << 4;
- CDF_TRACE(QDF_MODULE_ID_PE,
- CDF_TRACE_LEVEL_INFO,
+ QDF_TRACE(QDF_MODULE_ID_PE,
+ QDF_TRACE_LEVEL_INFO,
FL("old protection state: 0x%04X, new protection state: 0x%04X\n"),
pe_session_entry->old_protection_state,
current_protection_state);
@@ -177,8 +177,8 @@
if ((current_protection_state !=
pe_session_entry->old_protection_state) &&
(false == mac_ctx->sap.SapDfsInfo.is_dfs_cac_timer_running)) {
- CDF_TRACE(QDF_MODULE_ID_PE,
- CDF_TRACE_LEVEL_ERROR,
+ QDF_TRACE(QDF_MODULE_ID_PE,
+ QDF_TRACE_LEVEL_ERROR,
FL("protection changed, update beacon template\n"));
/* update beacon fix params and send update to FW */
cdf_mem_zero(&beacon_params, sizeof(tUpdateBeaconParams));
@@ -217,8 +217,8 @@
protection_fields_reset_timer,
SCH_PROTECTION_RESET_TIME)
!= QDF_STATUS_SUCCESS) {
- CDF_TRACE(QDF_MODULE_ID_PE,
- CDF_TRACE_LEVEL_ERROR,
+ QDF_TRACE(QDF_MODULE_ID_PE,
+ QDF_TRACE_LEVEL_ERROR,
FL("cannot create or start protectionFieldsResetTimer\n"));
}
}
@@ -326,7 +326,7 @@
session_ptr->fWaitForProbeRsp = 0;
session_ptr->fIgnoreCapsChange = 0;
- CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_DEBUG,
+ QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG,
FL("Create a new PE session(%d), BSSID: "MAC_ADDRESS_STR" Max No. of STA %d"),
session_ptr->peSessionId, MAC_ADDR_ARRAY(bssid), numSta);
@@ -376,7 +376,7 @@
SCH_PROTECTION_RESET_TIME);
}
if (status != QDF_STATUS_SUCCESS)
- CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_ERROR,
+ QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_ERROR,
FL("cannot create or start protectionFieldsResetTimer\n"));
}
@@ -532,12 +532,12 @@
TX_TIMER *timer_ptr;
if (!session || (session && !session->valid)) {
- CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_DEBUG,
+ QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG,
FL("session is not valid"));
return;
}
- CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_DEBUG,
+ QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG,
FL("Trying to delete PE session %d Opmode %d BssIdx %d BSSID: "MAC_ADDRESS_STR),
session->peSessionId, session->operMode,
session->bssIdx,
diff --git a/core/mac/src/pe/lim/lim_trace.c b/core/mac/src/pe/lim/lim_trace.c
index a5c76fa..10b8232 100644
--- a/core/mac/src/pe/lim/lim_trace.c
+++ b/core/mac/src/pe/lim/lim_trace.c
@@ -43,7 +43,7 @@
#include "lim_trace.h"
#include "lim_timer_utils.h"
-#include "cdf_trace.h"
+#include "qdf_trace.h"
#ifdef LIM_TRACE_RECORD
uint32_t g_mgmt_frame_stats[14];
@@ -106,10 +106,10 @@
void lim_trace_init(tpAniSirGlobal pMac)
{
- cdf_trace_register(QDF_MODULE_ID_PE, (tp_cdf_trace_cb) &lim_trace_dump);
+ qdf_trace_register(QDF_MODULE_ID_PE, (tp_qdf_trace_cb) &lim_trace_dump);
}
-void lim_trace_dump(tpAniSirGlobal pMac, tp_cdf_trace_record pRecord,
+void lim_trace_dump(tpAniSirGlobal pMac, tp_qdf_trace_record pRecord,
uint16_t recIndex)
{
diff --git a/core/mac/src/pe/lim/lim_utils.c b/core/mac/src/pe/lim/lim_utils.c
index 8d9dac0..2e71821 100644
--- a/core/mac/src/pe/lim/lim_utils.c
+++ b/core/mac/src/pe/lim/lim_utils.c
@@ -593,7 +593,7 @@
if (NULL == sta_ds)
continue;
- CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_ERROR,
+ QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_ERROR,
FL("Deleting pmfSaQueryTimer for staid[%d]"),
sta_ds->staIndex);
tx_timer_deactivate(&sta_ds->pmfSaQueryTimer);
@@ -735,7 +735,7 @@
* the pmfSaQueryTimer for it
*/
if (cds_is_driver_recovering()) {
- CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_ERROR,
+ QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_ERROR,
FL("SSR is detected, proceed to clean up pmfSaQueryTimer"));
for (bss_entry = 0; bss_entry < mac_ctx->lim.maxBssId;
bss_entry++) {
@@ -6812,7 +6812,7 @@
tSirMacAddr a1, tpPESession session)
{
if (mac_ctx == NULL || session == NULL) {
- CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO,
+ QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO,
"mac or session context is null");
/* let main routine handle it */
return true;
diff --git a/core/mac/src/pe/sch/sch_api.c b/core/mac/src/pe/sch/sch_api.c
index a717565..5a6744d 100644
--- a/core/mac/src/pe/sch/sch_api.c
+++ b/core/mac/src/pe/sch/sch_api.c
@@ -270,7 +270,7 @@
psessionEntry->schBeaconOffsetBegin)) {
sch_log(pMac, LOGE, FL("Invalid p2pIeOffset:[%d]"),
pMac->sch.schObject.p2pIeOffset);
- CDF_ASSERT(0);
+ QDF_ASSERT(0);
cdf_mem_free(beaconParams);
return eSIR_FAILURE;
}
diff --git a/core/mac/src/pe/sch/sch_beacon_process.c b/core/mac/src/pe/sch/sch_beacon_process.c
index 93c78d5..10809e6 100644
--- a/core/mac/src/pe/sch/sch_beacon_process.c
+++ b/core/mac/src/pe/sch/sch_beacon_process.c
@@ -135,8 +135,8 @@
return;
#ifdef FEATURE_WLAN_ESE
if (session->isESEconnection)
- CDF_TRACE(QDF_MODULE_ID_PE,
- CDF_TRACE_LEVEL_INFO,
+ QDF_TRACE(QDF_MODULE_ID_PE,
+ QDF_TRACE_LEVEL_INFO,
FL("[INFOLOG]ESE 11g erpPresent=%d useProtection=%d nonErpPresent=%d"),
bcn_struct->erpPresent,
bcn_struct->erpIEInfo.useProtection,
@@ -162,7 +162,7 @@
if (tmp_exp) {
#ifdef FEATURE_WLAN_ESE
if (session->isESEconnection) {
- CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO,
+ QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO,
FL("[INFOLOG]ESE 11g erpPresent=%d useProtection=%d nonErpPresent=%d"),
bcn_struct->erpPresent,
bcn_struct->erpIEInfo.useProtection,
diff --git a/core/mac/src/pe/sch/sch_debug.c b/core/mac/src/pe/sch/sch_debug.c
index 3f4f987..d637ce3 100644
--- a/core/mac/src/pe/sch/sch_debug.c
+++ b/core/mac/src/pe/sch/sch_debug.c
@@ -37,14 +37,14 @@
*
*/
-#include "cdf_trace.h"
+#include "qdf_trace.h"
#include "sch_debug.h"
#define LOG_SIZE 256
void sch_log(tpAniSirGlobal pMac, uint32_t loglevel, const char *pString, ...)
{
- CDF_TRACE_LEVEL cdf_debug_level;
+ QDF_TRACE_LEVEL cdf_debug_level;
char logBuffer[LOG_SIZE];
va_list marker;
@@ -54,7 +54,7 @@
/* extracting arguments from pstring */
va_start(marker, pString);
vsnprintf(logBuffer, LOG_SIZE, pString, marker);
- CDF_TRACE(QDF_MODULE_ID_PE, cdf_debug_level, "%s", logBuffer);
+ QDF_TRACE(QDF_MODULE_ID_PE, cdf_debug_level, "%s", logBuffer);
va_end(marker);
}