diff --git a/core/mac/src/include/sir_debug.h b/core/mac/src/include/sir_debug.h index 70f6f9e371..c19fab2ff5 100644 --- a/core/mac/src/include/sir_debug.h +++ b/core/mac/src/include/sir_debug.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2011-2012, 2014-2015, 2017-2019, 2021 The Linux Foundation. All rights reserved. + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for * any purpose with or without fee is hereby granted, provided that the @@ -56,6 +57,8 @@ QDF_TRACE_INFO_NO_FL(QDF_MODULE_ID_PE, params) #define pe_nofl_debug(params...) \ QDF_TRACE_DEBUG_NO_FL(QDF_MODULE_ID_PE, params) +#define pe_nofl_rl_err(params...) \ + QDF_TRACE_ERROR_RL_NO_FL(QDF_MODULE_ID_PE, params) #define pe_nofl_rl_debug(params...) \ QDF_TRACE_DEBUG_RL_NO_FL(QDF_MODULE_ID_PE, params) #define pe_nofl_rl_info(params...) \ 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 00c2c21034..719ba33ea6 100644 --- a/core/mac/src/pe/lim/lim_send_management_frames.c +++ b/core/mac/src/pe/lim/lim_send_management_frames.c @@ -5804,12 +5804,12 @@ lim_send_radio_measure_report_action_frame(struct mac_context *mac, pe_session); } - pe_nofl_info("TX: type:%d seq_no:%d dialog_token:%d no. of APs:%d is_last_rpt:%d num_report:%d peer:"QDF_MAC_ADDR_FMT, - frm->MeasurementReport[0].type, - (pMacHdr->seqControl.seqNumHi << HIGH_SEQ_NUM_OFFSET | - pMacHdr->seqControl.seqNumLo), - dialog_token, frm->num_MeasurementReport, - is_last_report, num_report, QDF_MAC_ADDR_REF(peer)); + pe_nofl_rl_info("TX: type:%d seq_no:%d dialog_token:%d no. of APs:%d is_last_rpt:%d num_report:%d peer:"QDF_MAC_ADDR_FMT, + frm->MeasurementReport[0].type, + (pMacHdr->seqControl.seqNumHi << HIGH_SEQ_NUM_OFFSET | + pMacHdr->seqControl.seqNumLo), + dialog_token, frm->num_MeasurementReport, + is_last_report, num_report, QDF_MAC_ADDR_REF(peer)); if (!wlan_reg_is_24ghz_ch_freq(pe_session->curr_op_freq) || pe_session->opmode == QDF_P2P_CLIENT_MODE || @@ -5825,8 +5825,8 @@ lim_send_radio_measure_report_action_frame(struct mac_context *mac, MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, pe_session->peSessionId, qdf_status)); if (QDF_STATUS_SUCCESS != qdf_status) { - pe_nofl_err("TX: [802.11 RRM] Send FAILED! err_status [%d]", - qdf_status); + pe_nofl_rl_err("TX: [802.11 RRM] Send FAILED! err_status [%d]", + qdf_status); status_code = QDF_STATUS_E_FAILURE; /* Pkt will be freed up by the callback */ } diff --git a/core/mac/src/pe/rrm/rrm_api.c b/core/mac/src/pe/rrm/rrm_api.c index 73e5b29540..1e95352dbc 100644 --- a/core/mac/src/pe/rrm/rrm_api.c +++ b/core/mac/src/pe/rrm/rrm_api.c @@ -1,6 +1,6 @@ /* * Copyright (c) 2012-2021 The Linux Foundation. All rights reserved. - * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2022-2024 Qualcomm Innovation Center, Inc. All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for * any purpose with or without fee is hereby granted, provided that the @@ -1240,18 +1240,18 @@ rrm_process_beacon_report_req(struct mac_context *mac, measDuration = pBeaconReq->measurement_request.Beacon.meas_duration; - pe_nofl_info("RX: [802.11 BCN_RPT] seq:%d SSID:" QDF_SSID_FMT " BSSID:" QDF_MAC_ADDR_FMT " Token:%d op_class:%d ch:%d meas_mode:%d meas_duration:%d max_meas_dur: %d", - mac->rrm.rrmPEContext.prev_rrm_report_seq_num, - QDF_SSID_REF( + pe_nofl_rl_info("RX: [802.11 BCN_RPT] seq:%d SSID:" QDF_SSID_FMT " BSSID:" QDF_MAC_ADDR_FMT " Token:%d op_class:%d ch:%d meas_mode:%d meas_duration:%d max_meas_dur: %d", + mac->rrm.rrmPEContext.prev_rrm_report_seq_num, + QDF_SSID_REF( pBeaconReq->measurement_request.Beacon.SSID.num_ssid, pBeaconReq->measurement_request.Beacon.SSID.ssid), - QDF_MAC_ADDR_REF( + QDF_MAC_ADDR_REF( pBeaconReq->measurement_request.Beacon.BSSID), - pBeaconReq->measurement_token, - pBeaconReq->measurement_request.Beacon.regClass, - pBeaconReq->measurement_request.Beacon.channel, - pBeaconReq->measurement_request.Beacon.meas_mode, - measDuration, maxMeasduration); + pBeaconReq->measurement_token, + pBeaconReq->measurement_request.Beacon.regClass, + pBeaconReq->measurement_request.Beacon.channel, + pBeaconReq->measurement_request.Beacon.meas_mode, + measDuration, maxMeasduration); req_mode = (pBeaconReq->parallel << 0) | (pBeaconReq->enable << 1) | (pBeaconReq->request << 2) | (pBeaconReq->report << 3) | diff --git a/core/sme/src/rrm/sme_rrm.c b/core/sme/src/rrm/sme_rrm.c index 417ba2fcb8..5e869a49e4 100644 --- a/core/sme/src/rrm/sme_rrm.c +++ b/core/sme/src/rrm/sme_rrm.c @@ -1,6 +1,6 @@ /* * Copyright (c) 2011-2021 The Linux Foundation. All rights reserved. - * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2022-2024 Qualcomm Innovation Center, Inc. All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for * any purpose with or without fee is hereby granted, provided that the @@ -1171,7 +1171,7 @@ static QDF_STATUS sme_rrm_fill_scan_channels(struct mac_context *mac, if (sme_rrm_context->channelList.numOfChannels == 0) { qdf_mem_free(sme_rrm_context->channelList.freq_list); sme_rrm_context->channelList.freq_list = NULL; - sme_err("No channels populated with requested operation class and current country, Hence abort the rrm operation"); + sme_err_rl("No channels populated with requested operation class and current country, Hence abort the rrm operation"); return QDF_STATUS_E_FAILURE; }