diff options
| author | Srinivas Girigowda <sgirigow@codeaurora.org> | 2017-03-16 17:41:26 -0700 |
|---|---|---|
| committer | Sandeep Puligilla <spuligil@codeaurora.org> | 2017-03-21 09:40:55 -0700 |
| commit | 6b27f26f510f357f6ac150705234ca6efa5ad75d (patch) | |
| tree | 23e92f1eb752267360a48104864f502196757848 | |
| parent | 432634a62e4e632b6affd60bbeb4dc1633139ab1 (diff) | |
qcacld-3.0: UMAC: Replace sir_dump_buf() with QDF_TRACE_HEX_DUMP()
Replace sir_dump_buf() with QDF_TRACE_HEX_DUMP().
Change-Id: I8093efa19d4b4bb3ce6e40c2894dfd67583a2758
CRs-Fixed: 2020798
19 files changed, 125 insertions, 201 deletions
@@ -729,7 +729,6 @@ SYS_OBJS := $(SYS_COMMON_SRC_DIR)/wlan_qct_sys.o \ $(SYS_LEGACY_SRC_DIR)/utils/src/log_api.o \ $(SYS_LEGACY_SRC_DIR)/utils/src/mac_trace.o \ $(SYS_LEGACY_SRC_DIR)/utils/src/parser_api.o \ - $(SYS_LEGACY_SRC_DIR)/utils/src/utils_api.o \ $(SYS_LEGACY_SRC_DIR)/utils/src/utils_parser.o ############ Qca-wifi-host-cmn ############ diff --git a/core/mac/src/include/utils_api.h b/core/mac/src/include/utils_api.h index 795151cf39ba..41458606a75b 100644 --- a/core/mac/src/include/utils_api.h +++ b/core/mac/src/include/utils_api.h @@ -64,9 +64,6 @@ extern QDF_TRACE_LEVEL get_vos_debug_level(uint32_t debugLevel); extern tSirRetStatus cfg_init(tpAniSirGlobal); extern void cfg_de_init(tpAniSirGlobal); -void sir_dump_buf(tpAniSirGlobal pMac, uint8_t modId, uint32_t level, - uint8_t *buf, uint32_t size); - /** * sir_swap_u16() * 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 33e24b102e87..78b4b2ee0439 100644 --- a/core/mac/src/pe/lim/lim_process_action_frame.c +++ b/core/mac/src/pe/lim/lim_process_action_frame.c @@ -1290,14 +1290,16 @@ __lim_process_sm_power_save_update(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo, FL ("Failed to unpack and parse a Update SM Power (0x%08x, %d bytes):"), nStatus, frameLen); - sir_dump_buf(pMac, SIR_DBG_MODULE_ID, LOGE, pBody, frameLen); + QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_ERROR, + pBody, frameLen); return; } else if (DOT11F_WARNED(nStatus)) { lim_log(pMac, LOGW, FL ("There were warnings while unpacking a SMPower Save update (0x%08x, %d bytes):"), nStatus, frameLen); - sir_dump_buf(pMac, SIR_DBG_MODULE_ID, LOGW, pBody, frameLen); + QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_ERROR, + pBody, frameLen); } lim_log(pMac, LOGD, @@ -1371,13 +1373,15 @@ __lim_process_radio_measure_request(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo, lim_log(pMac, LOGE, FL("Failed to unpack and parse a Radio Measure request (0x%08x, %d bytes):"), nStatus, frameLen); - sir_dump_buf(pMac, SIR_DBG_MODULE_ID, LOGE, pBody, frameLen); + QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_ERROR, + pBody, frameLen); goto err; } else if (DOT11F_WARNED(nStatus)) { lim_log(pMac, LOGW, FL("There were warnings while unpacking a Radio Measure request (0x%08x, %d bytes):"), nStatus, frameLen); - sir_dump_buf(pMac, SIR_DBG_MODULE_ID, LOGW, pBody, frameLen); + QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_WARN, + pBody, frameLen); } /* Call rrm function to handle the request. */ @@ -1413,14 +1417,16 @@ __lim_process_link_measurement_req(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo, FL ("Failed to unpack and parse a Link Measure request (0x%08x, %d bytes):"), nStatus, frameLen); - sir_dump_buf(pMac, SIR_DBG_MODULE_ID, LOGE, pBody, frameLen); + QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_ERROR, + pBody, frameLen); return eSIR_FAILURE; } else if (DOT11F_WARNED(nStatus)) { lim_log(pMac, LOGW, FL ("There were warnings while unpacking a Link Measure request (0x%08x, %d bytes):"), nStatus, frameLen); - sir_dump_buf(pMac, SIR_DBG_MODULE_ID, LOGW, pBody, frameLen); + QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_WARN, + pBody, frameLen); } /* Call rrm function to handle the request. */ @@ -1464,7 +1470,8 @@ __lim_process_neighbor_report(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo, FL ("Failed to unpack and parse a Neighbor report response (0x%08x, %d bytes):"), nStatus, frameLen); - sir_dump_buf(pMac, SIR_DBG_MODULE_ID, LOGE, pBody, frameLen); + QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_ERROR, + pBody, frameLen); qdf_mem_free(pFrm); return; } else if (DOT11F_WARNED(nStatus)) { @@ -1472,7 +1479,8 @@ __lim_process_neighbor_report(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo, FL ("There were warnings while unpacking a Neighbor report response (0x%08x, %d bytes):"), nStatus, frameLen); - sir_dump_buf(pMac, SIR_DBG_MODULE_ID, LOGW, pBody, frameLen); + QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_WARN, + pBody, frameLen); } /* Call rrm function to handle the request. */ rrm_process_neighbor_report_response(pMac, pFrm, psessionEntry); diff --git a/core/mac/src/pe/lim/lim_process_assoc_req_frame.c b/core/mac/src/pe/lim/lim_process_assoc_req_frame.c index 0d78e34397ac..5baebb4b96cc 100644 --- a/core/mac/src/pe/lim/lim_process_assoc_req_frame.c +++ b/core/mac/src/pe/lim/lim_process_assoc_req_frame.c @@ -1772,8 +1772,9 @@ void lim_process_assoc_req_frame(tpAniSirGlobal mac_ctx, uint8_t *rx_pkt_info, session->peSessionId, sub_type, GET_LIM_SYSTEM_ROLE(session), MAC_ADDR_ARRAY(hdr->sa)); - sir_dump_buf(mac_ctx, SIR_LIM_MODULE_ID, LOGD, - WMA_GET_RX_MPDU_DATA(rx_pkt_info), frame_len); + QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG, + WMA_GET_RX_MPDU_DATA(rx_pkt_info), + frame_len); return; } if (session->limMlmState == eLIM_MLM_WT_DEL_BSS_RSP_STATE) { diff --git a/core/mac/src/pe/lim/lim_process_probe_req_frame.c b/core/mac/src/pe/lim/lim_process_probe_req_frame.c index 328967651473..ec8bbfa8db23 100644 --- a/core/mac/src/pe/lim/lim_process_probe_req_frame.c +++ b/core/mac/src/pe/lim/lim_process_probe_req_frame.c @@ -102,10 +102,10 @@ void lim_get_wpspbc_sessions(tpAniSirGlobal mac_ctx, struct qdf_mac_addr addr, *overlap = eSAP_WPSPBC_ONE_WPSPBC_PROBE_REQ_IN120S; lim_log(mac_ctx, LOGD, FL("overlap = %d"), *overlap); - sir_dump_buf(mac_ctx, SIR_LIM_MODULE_ID, LOGE, addr.bytes, - QDF_MAC_ADDR_SIZE); - sir_dump_buf(mac_ctx, SIR_LIM_MODULE_ID, LOGE, uuid_e, - SIR_WPS_UUID_LEN); + QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG, + addr.bytes, QDF_MAC_ADDR_SIZE); + QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG, + uuid_e, SIR_WPS_UUID_LEN); return; } @@ -128,10 +128,10 @@ static void lim_remove_timeout_pbc_sessions(tpAniSirGlobal pMac, prev = pbc; pbc = pbc->next; lim_log(pMac, LOGD, FL("WPS PBC sessions remove")); - sir_dump_buf(pMac, SIR_LIM_MODULE_ID, LOGD, prev->addr.bytes, - sizeof(tSirMacAddr)); - sir_dump_buf(pMac, SIR_LIM_MODULE_ID, LOGD, prev->uuid_e, - SIR_WPS_UUID_LEN); + QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG, + prev->addr.bytes, QDF_MAC_ADDR_SIZE); + QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG, + prev->uuid_e, SIR_WPS_UUID_LEN); qdf_mem_free(prev); } @@ -201,8 +201,10 @@ static void lim_update_pbc_session_entry(tpAniSirGlobal pMac, QDF_TICKS_PER_SECOND); lim_log(pMac, LOGD, FL("Receive WPS probe reques curTime=%d"), curTime); - sir_dump_buf(pMac, SIR_LIM_MODULE_ID, LOGD, addr, sizeof(tSirMacAddr)); - sir_dump_buf(pMac, SIR_LIM_MODULE_ID, LOGD, uuid_e, SIR_WPS_UUID_LEN); + QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG, + addr, QDF_MAC_ADDR_SIZE); + QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG, + uuid_e, SIR_WPS_UUID_LEN); pbc = psessionEntry->pAPWPSPBCSession; @@ -433,10 +435,13 @@ lim_process_probe_req_frame(tpAniSirGlobal mac_ctx, uint8_t *rx_pkt_info, WSC_PASSWD_ID_PUSH_BUTTON) && (probe_req.probeReqWscIeInfo.UUID_E.present == 1))) { if (session->fwdWPSPBCProbeReq) { - sir_dump_buf(mac_ctx, SIR_LIM_MODULE_ID, - LOGD, mac_hdr->sa, sizeof(tSirMacAddr)); - sir_dump_buf(mac_ctx, SIR_LIM_MODULE_ID, - LOGD, body_ptr, frame_len); + QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, + QDF_TRACE_LEVEL_DEBUG, + mac_hdr->sa, + QDF_MAC_ADDR_SIZE); + QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, + QDF_TRACE_LEVEL_DEBUG, + body_ptr, frame_len); lim_send_sme_probe_req_ind(mac_ctx, mac_hdr->sa, body_ptr, frame_len, session); } else { 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 de93c9ca00c8..390a1c428d3c 100644 --- a/core/mac/src/pe/lim/lim_prop_exts_utils.c +++ b/core/mac/src/pe/lim/lim_prop_exts_utils.c @@ -131,7 +131,8 @@ lim_extract_ap_capability(tpAniSirGlobal mac_ctx, uint8_t *p_ie, *uapsd = 0; lim_log(mac_ctx, LOGD, FL("In lim_extract_ap_capability: The IE's being received:")); - sir_dump_buf(mac_ctx, SIR_LIM_MODULE_ID, LOGD, p_ie, ie_len); + QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG, + p_ie, ie_len); if (sir_parse_beacon_ie(mac_ctx, beacon_struct, p_ie, (uint32_t) ie_len) != eSIR_SUCCESS) { lim_log(mac_ctx, LOGE, FL( 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 2d678b5dc636..92b76d6207d0 100644 --- a/core/mac/src/pe/lim/lim_scan_result_utils.c +++ b/core/mac/src/pe/lim/lim_scan_result_utils.c @@ -162,11 +162,6 @@ lim_collect_bss_description(tpAniSirGlobal pMac, /* Copy RSSI & SINR from BD */ - lim_log(pMac, LOGD, "*********BSS Description for BSSID:********* "); - sir_dump_buf(pMac, SIR_LIM_MODULE_ID, LOGD, pBssDescr->bssId, 6); - sir_dump_buf(pMac, SIR_LIM_MODULE_ID, LOGD, - (uint8_t *) pRxPacketInfo, 36); - pBssDescr->rssi = (int8_t) WMA_GET_RX_RSSI_NORMALIZED(pRxPacketInfo); pBssDescr->rssi_raw = (int8_t) WMA_GET_RX_RSSI_RAW(pRxPacketInfo); diff --git a/core/mac/src/pe/lim/lim_security_utils.c b/core/mac/src/pe/lim/lim_security_utils.c index 55a84f129234..159a76c5fae2 100644 --- a/core/mac/src/pe/lim/lim_security_utils.c +++ b/core/mac/src/pe/lim/lim_security_utils.c @@ -736,9 +736,6 @@ lim_decrypt_auth_frame(tpAniSirGlobal pMac, uint8_t *pKey, uint8_t *pEncrBody, lim_rc4(pPlainBody, pEncrBody + SIR_MAC_WEP_IV_LENGTH, seed, keyLength, frameLen); - lim_log(pMac, LOGD, FL("plainbody is ")); - sir_dump_buf(pMac, SIR_LIM_MODULE_ID, LOGD, pPlainBody, frameLen); - /* Compute CRC-32 and place them in last 4 bytes of encrypted body */ lim_compute_crc32(icv, (uint8_t *) pPlainBody, diff --git a/core/mac/src/pe/lim/lim_send_frames_host_roam.c b/core/mac/src/pe/lim/lim_send_frames_host_roam.c index f1b58934fc22..d10b579e33ba 100644 --- a/core/mac/src/pe/lim/lim_send_frames_host_roam.c +++ b/core/mac/src/pe/lim/lim_send_frames_host_roam.c @@ -406,8 +406,8 @@ void lim_send_reassoc_req_with_ft_ies_mgmt_frame(tpAniSirGlobal mac_ctx, } } lim_log(mac_ctx, LOGD, FL("Re-assoc Req Frame is: ")); - sir_dump_buf(mac_ctx, SIR_LIM_MODULE_ID, LOGD, - (uint8_t *) frame, (bytes + ft_ies_length)); + QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG, + (uint8_t *) frame, (bytes + ft_ies_length)); if ((NULL != pe_session->ftPEContext.pFTPreAuthReq) && (SIR_BAND_5_GHZ == lim_get_rf_band( 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 962b6fee4f02..a36da0d1aa41 100644 --- a/core/mac/src/pe/lim/lim_send_management_frames.c +++ b/core/mac/src/pe/lim/lim_send_management_frames.c @@ -2366,9 +2366,10 @@ alloc_packet: ft_ies_length); lim_log(mac_ctx, LOGD, FL("Auth1 Frame FTIE is: ")); - sir_dump_buf(mac_ctx, SIR_LIM_MODULE_ID, LOGD, - (uint8_t *) body, - ft_ies_length); + QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, + QDF_TRACE_LEVEL_DEBUG, + (uint8_t *) body, + ft_ies_length); } else if (NULL != session->ftPEContext. pFTPreAuthReq->pbssDescription) { /* MDID attr is 54 */ @@ -2392,7 +2393,9 @@ alloc_packet: eSIR_MAC_SUCCESS_STATUS), MAC_ADDR_ARRAY(mac_hdr->da)); } - sir_dump_buf(mac_ctx, SIR_LIM_MODULE_ID, LOGD, frame, frame_len); + QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, + QDF_TRACE_LEVEL_DEBUG, + frame, frame_len); if ((NULL != session->ftPEContext.pFTPreAuthReq) && (SIR_BAND_5_GHZ == lim_get_rf_band( diff --git a/core/mac/src/pe/lim/lim_ser_des_utils.c b/core/mac/src/pe/lim/lim_ser_des_utils.c index 619b6e7016b6..28dc1e408497 100644 --- a/core/mac/src/pe/lim/lim_ser_des_utils.c +++ b/core/mac/src/pe/lim/lim_ser_des_utils.c @@ -102,10 +102,6 @@ tSirRetStatus lim_send_disassoc_frm_req_ser_des(tpAniSirGlobal mac_ctx, len = disassoc_frm_req->length = lim_get_u16(buf); buf += sizeof(A_UINT16); - lim_log(mac_ctx, LOGD, - FL("SME_DISASSOC_REQ length %d bytes is:"), len); - sir_dump_buf(mac_ctx, SIR_LIM_MODULE_ID, LOGD, buf, len); - if (len < (A_INT16) sizeof(A_UINT32)) return eSIR_FAILURE; diff --git a/core/mac/src/pe/lim/lim_sme_req_utils.c b/core/mac/src/pe/lim/lim_sme_req_utils.c index 330b4e7d2576..667fc8292561 100644 --- a/core/mac/src/pe/lim/lim_sme_req_utils.c +++ b/core/mac/src/pe/lim/lim_sme_req_utils.c @@ -445,8 +445,10 @@ lim_is_sme_start_bss_req_valid(tpAniSirGlobal mac_ctx, lim_log(mac_ctx, LOGW, FL("Invalid operational 11A rates")); - sir_dump_buf(mac_ctx, SIR_LIM_MODULE_ID, LOGW, - opr_rates->rate, opr_rates->numRates); + QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, + QDF_TRACE_LEVEL_WARN, + opr_rates->rate, + opr_rates->numRates); return false; } return true; @@ -459,8 +461,10 @@ lim_is_sme_start_bss_req_valid(tpAniSirGlobal mac_ctx, lim_log(mac_ctx, LOGW, FL("Invalid operational 11G rates")); - sir_dump_buf(mac_ctx, SIR_LIM_MODULE_ID, LOGW, - opr_rates->rate, opr_rates->numRates); + QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, + QDF_TRACE_LEVEL_WARN, + opr_rates->rate, + opr_rates->numRates); return false; } return true; @@ -472,8 +476,10 @@ lim_is_sme_start_bss_req_valid(tpAniSirGlobal mac_ctx, lim_log(mac_ctx, LOGW, FL("Invalid operational 11B rates")); - sir_dump_buf(mac_ctx, SIR_LIM_MODULE_ID, LOGW, - opr_rates->rate, opr_rates->numRates); + QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, + QDF_TRACE_LEVEL_WARN, + opr_rates->rate, + opr_rates->numRates); return false; } return true; diff --git a/core/mac/src/pe/rrm/rrm_api.c b/core/mac/src/pe/rrm/rrm_api.c index 30c775a06dfd..94f5d31f070c 100644 --- a/core/mac/src/pe/rrm/rrm_api.c +++ b/core/mac/src/pe/rrm/rrm_api.c @@ -497,11 +497,10 @@ rrm_process_neighbor_report_req(tpAniSirGlobal pMac, if (NeighborReportReq.ssid_present) { qdf_mem_copy(&NeighborReportReq.ssid, &pNeighborReq->ucSSID, sizeof(tSirMacSSid)); - PELOGE(sir_dump_buf - (pMac, SIR_LIM_MODULE_ID, LOGE, - (uint8_t *) NeighborReportReq.ssid.ssId, - NeighborReportReq.ssid.length); - ) + QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, + QDF_TRACE_LEVEL_DEBUG, + (uint8_t *) NeighborReportReq.ssid.ssId, + NeighborReportReq.ssid.length); } status = diff --git a/core/mac/src/pe/sch/sch_beacon_gen.c b/core/mac/src/pe/sch/sch_beacon_gen.c index cb1c43e0d5e3..bd5ad74cc174 100644 --- a/core/mac/src/pe/sch/sch_beacon_gen.c +++ b/core/mac/src/pe/sch/sch_beacon_gen.c @@ -813,13 +813,6 @@ static void write_beacon_to_memory(tpAniSirGlobal pMac, uint16_t size, } else pBeacon->beaconLength = (uint32_t) size - sizeof(uint32_t); - /* write size bytes from pSchBeaconFrameBegin */ - PELOG2(sch_log(pMac, LOG2, FL("Beacon size - %d bytes"), size);) - PELOG2(sir_dump_buf - (pMac, SIR_SCH_MODULE_ID, LOG2, - psessionEntry->pSchBeaconFrameBegin, size); - ) - if (!pMac->sch.schObject.fBeaconChanged) return; @@ -899,9 +892,6 @@ void sch_generate_tim(tpAniSirGlobal pMac, uint8_t **pPtr, uint16_t *timLength, *ptr++ = 0xFF; ptr += (N2 - N1 + 1); - PELOG2(sir_dump_buf - (pMac, SIR_SCH_MODULE_ID, LOG2, *pPtr, (*timLength) + 2); - ) * pPtr = ptr; } /* -------------------------------------------------------------------- */ diff --git a/core/mac/src/sys/legacy/src/system/src/sys_entry_func.c b/core/mac/src/sys/legacy/src/system/src/sys_entry_func.c index 06b553bde2d3..3b9640d2d7f5 100644 --- a/core/mac/src/sys/legacy/src/system/src/sys_entry_func.c +++ b/core/mac/src/sys/legacy/src/system/src/sys_entry_func.c @@ -114,14 +114,6 @@ sys_bbt_process_message_core(tpAniSirGlobal mac_ctx, tpSirMsgQ msg, if (!QDF_IS_STATUS_SUCCESS(qdf_status)) goto fail; - sys_log(mac_ctx, LOG3, FL("Rx Mgmt Frame Subtype: %d\n"), subtype); - sir_dump_buf(mac_ctx, SIR_SYS_MODULE_ID, LOG3, - (uint8_t *) WMA_GET_RX_MAC_HEADER(bd_ptr), - WMA_GET_RX_MPDU_LEN(bd_ptr)); - sir_dump_buf(mac_ctx, SIR_SYS_MODULE_ID, LOG3, - WMA_GET_RX_MPDU_DATA(bd_ptr), - WMA_GET_RX_PAYLOAD_LEN(bd_ptr)); - mac_ctx->sys.gSysFrameCount[type][subtype]++; framecount = mac_ctx->sys.gSysFrameCount[type][subtype]; diff --git a/core/mac/src/sys/legacy/src/utils/inc/dot11fdefs.h b/core/mac/src/sys/legacy/src/utils/inc/dot11fdefs.h index 7a155bf8cdee..704b7a6ef7ad 100644 --- a/core/mac/src/sys/legacy/src/utils/inc/dot11fdefs.h +++ b/core/mac/src/sys/legacy/src/utils/inc/dot11fdefs.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2012, 2014-2016 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2012, 2014-2017 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -76,7 +76,7 @@ dot11f_log((ctx), (sev), (fmt), (p1), (p2), (p3)); #define FRAMES_DUMP(ctx, sev, p, n) \ - sir_dump_buf((pCtx), SIR_DBG_MODULE_ID, (sev), (p), (n)); + QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, (sev), (p), (n); #endif /* #if defined( DOT11F_ENABLE_LOGGING ) */ diff --git a/core/mac/src/sys/legacy/src/utils/src/parser_api.c b/core/mac/src/sys/legacy/src/utils/src/parser_api.c index 3017858b748e..871650220d50 100644 --- a/core/mac/src/sys/legacy/src/utils/src/parser_api.c +++ b/core/mac/src/sys/legacy/src/utils/src/parser_api.c @@ -2193,13 +2193,15 @@ sir_convert_probe_req_frame2_struct(tpAniSirGlobal pMac, lim_log(pMac, LOGE, FL("Failed to parse a Probe Request (0x%08x, %d bytes):"), status, nFrame); - sir_dump_buf(pMac, SIR_DBG_MODULE_ID, LOGD, pFrame, nFrame); + QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_ERROR, + pFrame, nFrame); return eSIR_FAILURE; } else if (DOT11F_WARNED(status)) { lim_log(pMac, LOGW, FL("There were warnings while unpacking a Probe Request (0x%08x, %d bytes):"), status, nFrame); - sir_dump_buf(pMac, SIR_DBG_MODULE_ID, LOGD, pFrame, nFrame); + QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_WARN, + pFrame, nFrame); } /* & "transliterate" from a 'tDot11fProbeRequestto' a 'tSirProbeReq'... */ if (!pr.SSID.present) { @@ -2333,14 +2335,16 @@ tSirRetStatus sir_convert_probe_frame2_struct(tpAniSirGlobal pMac, lim_log(pMac, LOGE, FL("Failed to parse a Probe Response (0x%08x, %d bytes):"), status, nFrame); - sir_dump_buf(pMac, SIR_DBG_MODULE_ID, LOGD, pFrame, nFrame); + QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_ERROR, + pFrame, nFrame); qdf_mem_free(pr); return eSIR_FAILURE; } else if (DOT11F_WARNED(status)) { lim_log(pMac, LOGW, FL("There were warnings while unpacking a Probe Response (0x%08x, %d bytes):"), status, nFrame); - sir_dump_buf(pMac, SIR_DBG_MODULE_ID, LOGD, pFrame, nFrame); + QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_WARN, + pFrame, nFrame); } /* & "transliterate" from a 'tDot11fProbeResponse' to a 'tSirProbeRespBeacon'... */ @@ -2631,14 +2635,16 @@ sir_convert_assoc_req_frame2_struct(tpAniSirGlobal pMac, lim_log(pMac, LOGE, FL("Failed to parse an Association Request (0x%08x, %d bytes):"), status, nFrame); - sir_dump_buf(pMac, SIR_DBG_MODULE_ID, LOGD, pFrame, nFrame); + QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_ERROR, + pFrame, nFrame); qdf_mem_free(ar); return eSIR_FAILURE; } else if (DOT11F_WARNED(status)) { lim_log(pMac, LOGW, FL("There were warnings while unpacking an Assoication Request (0x%08x, %d bytes):"), status, nFrame); - sir_dump_buf(pMac, SIR_DBG_MODULE_ID, LOGD, pFrame, nFrame); + QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_WARN, + pFrame, nFrame); } /* & "transliterate" from a 'tDot11fAssocRequest' to a 'tSirAssocReq'... */ @@ -2828,14 +2834,15 @@ sir_convert_assoc_resp_frame2_struct(tpAniSirGlobal pMac, lim_log(pMac, LOGE, FL("Failed to parse an Association Response (0x%08x, %d bytes):"), status, nFrame); - sir_dump_buf(pMac, SIR_DBG_MODULE_ID, LOGE, pFrame, nFrame); + QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_ERROR, + pFrame, nFrame); return eSIR_FAILURE; } else if (DOT11F_WARNED(status)) { lim_log(pMac, LOGW, FL("There were warnings while unpacking an Association Response (0x%08x, %d bytes):"), status, nFrame); - sir_dump_buf(pMac, SIR_DBG_MODULE_ID, LOGW, pFrame, - nFrame); + QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_WARN, + pFrame, nFrame); } /* & "transliterate" from a 'tDot11fAssocResponse' a 'tSirAssocRsp'... */ @@ -3046,13 +3053,15 @@ sir_convert_reassoc_req_frame2_struct(tpAniSirGlobal pMac, lim_log(pMac, LOGE, FL("Failed to parse a Re-association Request (0x%08x, %d bytes):"), status, nFrame); - sir_dump_buf(pMac, SIR_DBG_MODULE_ID, LOGD, pFrame, nFrame); + QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_ERROR, + pFrame, nFrame); return eSIR_FAILURE; } else if (DOT11F_WARNED(status)) { lim_log(pMac, LOGW, FL("There were warnings while unpacking a Re-association Request (0x%08x, %d bytes):"), status, nFrame); - sir_dump_buf(pMac, SIR_DBG_MODULE_ID, LOGD, pFrame, nFrame); + QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_WARN, + pFrame, nFrame); } /* & "transliterate" from a 'tDot11fReAssocRequest' to a 'tSirAssocReq'... */ @@ -3238,7 +3247,8 @@ sir_beacon_ie_ese_bcn_report(tpAniSirGlobal pMac, lim_log(pMac, LOGW, FL("There were warnings while unpacking Beacon IEs (0x%08x, %d bytes):"), status, nPayload); - sir_dump_buf(pMac, SIR_DBG_MODULE_ID, LOGD, pPayload, nPayload); + QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_WARN, + pPayload, nPayload); } /* & "transliterate" from a 'tDot11fBeaconIEs' to a 'eseBcnReportMandatoryIe'... */ if (!pBies->SSID.present) { @@ -3523,14 +3533,16 @@ sir_parse_beacon_ie(tpAniSirGlobal pMac, lim_log(pMac, LOGE, FL("Failed to parse Beacon IEs (0x%08x, %d bytes):"), status, nPayload); - sir_dump_buf(pMac, SIR_DBG_MODULE_ID, LOGD, pPayload, nPayload); + QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_ERROR, + pPayload, nPayload); qdf_mem_free(pBies); return eSIR_FAILURE; } else if (DOT11F_WARNED(status)) { lim_log(pMac, LOGW, FL("There were warnings while unpacking Beacon IEs (0x%08x, %d bytes):"), status, nPayload); - sir_dump_buf(pMac, SIR_DBG_MODULE_ID, LOGD, pPayload, nPayload); + QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_WARN, + pPayload, nPayload); } /* & "transliterate" from a 'tDot11fBeaconIEs' to a 'tSirProbeRespBeacon'... */ if (!pBies->SSID.present) { @@ -3822,14 +3834,16 @@ sir_convert_beacon_frame2_struct(tpAniSirGlobal pMac, lim_log(pMac, LOGE, FL("Failed to parse Beacon IEs (0x%08x, %d bytes):"), status, nPayload); - sir_dump_buf(pMac, SIR_DBG_MODULE_ID, LOGD, pPayload, nPayload); + QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_ERROR, + pPayload, nPayload); qdf_mem_free(pBeacon); return eSIR_FAILURE; } else if (DOT11F_WARNED(status)) { lim_log(pMac, LOGW, FL("There were warnings while unpacking Beacon IEs (0x%08x, %d bytes):"), status, nPayload); - sir_dump_buf(pMac, SIR_DBG_MODULE_ID, LOGD, pPayload, nPayload); + QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_WARN, + pPayload, nPayload); } /* & "transliterate" from a 'tDot11fBeacon' to a 'tSirProbeRespBeacon'... */ /* Timestamp */ @@ -4174,13 +4188,15 @@ sir_convert_auth_frame2_struct(tpAniSirGlobal pMac, lim_log(pMac, LOGE, FL("Failed to parse an Authentication frame (0x%08x, %d bytes):"), status, nFrame); - sir_dump_buf(pMac, SIR_DBG_MODULE_ID, LOGD, pFrame, nFrame); + QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_ERROR, + pFrame, nFrame); return eSIR_FAILURE; } else if (DOT11F_WARNED(status)) { lim_log(pMac, LOGW, FL("There were warnings while unpacking an Authentication frame (0x%08x, %d bytes):"), status, nFrame); - sir_dump_buf(pMac, SIR_DBG_MODULE_ID, LOGD, pFrame, nFrame); + QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_WARN, + pFrame, nFrame); } /* & "transliterate" from a 'tDot11fAuthentication' to a 'tSirMacAuthFrameBody'... */ pAuth->authAlgoNumber = auth.AuthAlgo.algo; @@ -4241,14 +4257,15 @@ sir_convert_addts_req2_struct(tpAniSirGlobal pMac, lim_log(pMac, LOGE, FL("Failed to parse an Add TS Request frame (0x%08x, %d bytes):"), status, nFrame); - sir_dump_buf(pMac, SIR_DBG_MODULE_ID, LOGD, pFrame, nFrame); + QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_ERROR, + pFrame, nFrame); return eSIR_FAILURE; } else if (DOT11F_WARNED(status)) { lim_log(pMac, LOGW, FL("There were warnings while unpacking an Add TS Request frame (0x%08x,%d bytes):"), status, nFrame); - sir_dump_buf - (pMac, SIR_DBG_MODULE_ID, LOGD, pFrame, nFrame); + QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_WARN, + pFrame, nFrame); } /* & "transliterate" from a 'tDot11fAddTSRequest' or a */ /* 'tDot11WMMAddTSRequest' to a 'tSirMacAddtsReqInfo'... */ @@ -4379,13 +4396,15 @@ sir_convert_addts_rsp2_struct(tpAniSirGlobal pMac, lim_log(pMac, LOGE, FL("Failed to parse an Add TS Response frame (0x%08x, %d bytes):"), status, nFrame); - sir_dump_buf(pMac, SIR_DBG_MODULE_ID, LOGD, pFrame, nFrame); + QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_ERROR, + pFrame, nFrame); return eSIR_FAILURE; } else if (DOT11F_WARNED(status)) { lim_log(pMac, LOGW, FL("There were warnings while unpacking an Add TS Response frame (0x%08x,%d bytes):"), status, nFrame); - sir_dump_buf(pMac, SIR_DBG_MODULE_ID, LOGD, pFrame, nFrame); + QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_WARN, + pFrame, nFrame); } /* & "transliterate" from a 'tDot11fAddTSResponse' or a */ /* 'tDot11WMMAddTSResponse' to a 'tSirMacAddtsRspInfo'... */ @@ -4550,13 +4569,15 @@ sir_convert_delts_req2_struct(tpAniSirGlobal pMac, lim_log(pMac, LOGE, FL("Failed to parse an Del TS Request frame (0x%08x, %d bytes):"), status, nFrame); - sir_dump_buf(pMac, SIR_DBG_MODULE_ID, LOGD, pFrame, nFrame); + QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_ERROR, + pFrame, nFrame); return eSIR_FAILURE; } else if (DOT11F_WARNED(status)) { dot11f_log(pMac, LOGW, FL("There were warnings while unpacking an Del TS Request frame (0x%08x,%d bytes):"), status, nFrame); - sir_dump_buf(pMac, SIR_DBG_MODULE_ID, LOGD, pFrame, nFrame); + QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_WARN, + pFrame, nFrame); } /* & "transliterate" from a 'tDot11fDelTSResponse' or a */ /* 'tDot11WMMDelTSResponse' to a 'tSirMacDeltsReqInfo'... */ @@ -4608,13 +4629,15 @@ sir_convert_qos_map_configure_frame2_struct(tpAniSirGlobal pMac, dot11f_log(pMac, LOGE, FL("Failed to parse Qos Map Configure frame (0x%08x, %d bytes):"), status, nFrame); - sir_dump_buf(pMac, SIR_DBG_MODULE_ID, LOGD, pFrame, nFrame); + QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_ERROR, + pFrame, nFrame); return eSIR_FAILURE; } else if (DOT11F_WARNED(status)) { dot11f_log(pMac, LOGW, FL("There were warnings while unpacking Qos Map Configure frame (0x%08x, %d bytes):"), status, nFrame); - sir_dump_buf(pMac, SIR_DBG_MODULE_ID, LOGD, pFrame, nFrame); + QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_WARN, + pFrame, nFrame); } pQosMapSet->present = mapConfigure.QosMapSet.present; convert_qos_mapset_frame(pMac->hHdd, pQosMapSet, &mapConfigure.QosMapSet); @@ -4638,13 +4661,15 @@ sir_convert_tpc_req_frame2_struct(tpAniSirGlobal pMac, dot11f_log(pMac, LOGE, FL("Failed to parse a TPC Request frame (0x%08x, %d bytes):"), status, nFrame); - sir_dump_buf(pMac, SIR_DBG_MODULE_ID, LOGD, pFrame, nFrame); + QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_ERROR, + pFrame, nFrame); return eSIR_FAILURE; } else if (DOT11F_WARNED(status)) { dot11f_log(pMac, LOGW, FL("There were warnings while unpacking a TPC Request frame (0x%08x, %d bytes):"), status, nFrame); - sir_dump_buf(pMac, SIR_DBG_MODULE_ID, LOGD, pFrame, nFrame); + QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_WARN, + pFrame, nFrame); } /* & "transliterate" from a 'tDot11fTPCRequest' to a */ /* 'tSirMacTpcReqActionFrame'... */ @@ -4679,13 +4704,15 @@ sir_convert_meas_req_frame2_struct(tpAniSirGlobal pMac, dot11f_log(pMac, LOGE, FL("Failed to parse a Measurement Request frame (0x%08x, %d bytes):"), status, nFrame); - sir_dump_buf(pMac, SIR_DBG_MODULE_ID, LOGD, pFrame, nFrame); + QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_ERROR, + pFrame, nFrame); return eSIR_FAILURE; } else if (DOT11F_WARNED(status)) { dot11f_log(pMac, LOGW, FL("There were warnings while unpacking a Measurement Request frame (0x%08x, %d bytes):"), status, nFrame); - sir_dump_buf(pMac, SIR_DBG_MODULE_ID, LOGD, pFrame, nFrame); + QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_WARN, + pFrame, nFrame); } /* & "transliterate" from a 'tDot11fMeasurementRequest' to a */ /* 'tpSirMacMeasReqActionFrame'... */ diff --git a/core/mac/src/sys/legacy/src/utils/src/utils_api.c b/core/mac/src/sys/legacy/src/utils/src/utils_api.c deleted file mode 100644 index ed351bd69c82..000000000000 --- a/core/mac/src/sys/legacy/src/utils/src/utils_api.c +++ /dev/null @@ -1,88 +0,0 @@ -/* - * Copyright (c) 2013-2014, 2017 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * Permission to use, copy, modify, and/or distribute this software for - * any purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -/* ================================================================== */ -/* */ -/* File: utils_api.cc */ -/* */ -/* Description: Implemention of a few utility routines. */ -/* */ -/* Author: Neelay Das */ -/* */ -/* // */ -/* Change gHistory: */ -/* 12/15/2003 - NDA - Initial version. */ -/* */ -/* =================================================================== */ - -#include "utils_api.h" - -/* ------------------------------------------------------------------- */ -/** - * sir_dump_buf() - * - * FUNCTION: - * This function is called to dump a buffer with a certain level - * - * LOGIC: - * - * ASSUMPTIONS: - * None. - * - * NOTE: - * - * @param pBuf: buffer pointer - * @return None. - */ -void -sir_dump_buf(tpAniSirGlobal pMac, uint8_t modId, uint32_t level, uint8_t *buf, - uint32_t size) -{ - uint32_t i; - - log_dbg(pMac, modId, level, FL("Dumping %d bytes in host order\n"), - size); - - for (i = 0; (i + 7) < size; i += 8) { - log_dbg(pMac, modId, level, - "%02x %02x %02x %02x %02x %02x %02x %02x \n", - buf[i], - buf[i + 1], - buf[i + 2], - buf[i + 3], - buf[i + 4], buf[i + 5], buf[i + 6], buf[i + 7]); - } - - /* Dump the bytes in the last line */ - for (; i < size; i++) { - log_dbg(pMac, modId, level, "%02x ", buf[i]); - - if ((i + 1) == size) - log_dbg(pMac, modId, level, "\n"); - } - -} /*** end sir_dump_buf() ***/ diff --git a/core/sme/src/common/sme_api.c b/core/sme/src/common/sme_api.c index 5953bb4bf294..c227cb1fefe3 100644 --- a/core/sme/src/common/sme_api.c +++ b/core/sme/src/common/sme_api.c @@ -7136,10 +7136,6 @@ QDF_STATUS sme_update_p2p_ie(tHalHandle hHal, void *p2pIe, uint32_t p2pIeLength) status = QDF_STATUS_E_NOMEM; } else { pMac->p2pContext.probeRspIeLength = p2pIeLength; - - sir_dump_buf(pMac, SIR_LIM_MODULE_ID, LOGD, - pMac->p2pContext.probeRspIe, - pMac->p2pContext.probeRspIeLength); qdf_mem_copy((uint8_t *) pMac->p2pContext.probeRspIe, p2pIe, p2pIeLength); } |
