From cfdb4a7249639917f65dfa2d43f3fa7d2e1bf1d8 Mon Sep 17 00:00:00 2001 From: Kiran Kumar Lokere Date: Wed, 30 Oct 2019 18:02:07 -0700 Subject: [PATCH] qcacld-3.0: Correct the log level of debug message Change the log level to debug for HE operation IE information and check for 6G session to log 6G operation IE information. Change-Id: I9bcad23022253438381a68fe37f68d525d265035 CRs-Fixed: 2552012 --- core/mac/src/pe/lim/lim_utils.c | 38 ++++++++++--------- core/mac/src/pe/lim/lim_utils.h | 7 +++- .../src/sys/legacy/src/utils/src/parser_api.c | 2 +- 3 files changed, 27 insertions(+), 20 deletions(-) diff --git a/core/mac/src/pe/lim/lim_utils.c b/core/mac/src/pe/lim/lim_utils.c index d73567df64244..07a8f8db6cf60 100644 --- a/core/mac/src/pe/lim/lim_utils.c +++ b/core/mac/src/pe/lim/lim_utils.c @@ -7033,7 +7033,8 @@ void lim_log_he_cap(struct mac_context *mac, tDot11fIEhe_cap *he_cap) &he_cap->ppet, HE_MAX_PPET_SIZE); } -void lim_log_he_op(struct mac_context *mac, tDot11fIEhe_op *he_ops) +void lim_log_he_op(struct mac_context *mac, tDot11fIEhe_op *he_ops, + struct pe_session *session) { pe_debug("bss_color: %0x, default_pe_duration: %0x, twt_required: %0x, txop_rts_threshold: %0x, vht_oper_present: %0x", he_ops->bss_color, he_ops->default_pe, @@ -7046,23 +7047,26 @@ void lim_log_he_op(struct mac_context *mac, tDot11fIEhe_op *he_ops) pe_debug("he basic mcs nss: 0x%04x", *((uint16_t *)he_ops->basic_mcs_nss)); - if (!he_ops->vht_oper_present) - pe_debug("VHT Info not present in HE Operation"); - else - pe_debug("VHT Info: chan_width: %d, center_freq0: %d, center_freq1: %d", - he_ops->vht_oper.info.chan_width, - he_ops->vht_oper.info.center_freq_seg0, - he_ops->vht_oper.info.center_freq_seg1); + if (!session->he_6ghz_band) { + if (!he_ops->vht_oper_present) + pe_debug("VHT Info not present in HE Operation"); + else + pe_debug("VHT Info: ch_bw %d cntr_freq0 %d cntr_freq1 %d", + he_ops->vht_oper.info.chan_width, + he_ops->vht_oper.info.center_freq_seg0, + he_ops->vht_oper.info.center_freq_seg1); + } else { + if (!he_ops->oper_info_6g_present) + pe_debug("6G op_info not present in HE Operation"); + else + pe_debug("6G_op_info:ch_bw %d cntr_freq0 %d cntr_freq1 %d dup_bcon %d, min_rate %d", + he_ops->oper_info_6g.info.ch_width, + he_ops->oper_info_6g.info.center_freq_seg0, + he_ops->oper_info_6g.info.center_freq_seg1, + he_ops->oper_info_6g.info.dup_bcon, + he_ops->oper_info_6g.info.min_rate); + } - if (!he_ops->oper_info_6g_present) - pe_err("6G op_info not present in HE Operation"); - else - pe_err("6G_oper_info: chan_width: %d, center_freq0: %d, center_freq1: %d dup_bcon %d, min_rate %d", - he_ops->oper_info_6g.info.ch_width, - he_ops->oper_info_6g.info.center_freq_seg0, - he_ops->oper_info_6g.info.center_freq_seg1, - he_ops->oper_info_6g.info.dup_bcon, - he_ops->oper_info_6g.info.min_rate); } void lim_log_he_6g_cap(struct mac_context *mac, diff --git a/core/mac/src/pe/lim/lim_utils.h b/core/mac/src/pe/lim/lim_utils.h index 358084c1d4419..83b432888d129 100644 --- a/core/mac/src/pe/lim/lim_utils.h +++ b/core/mac/src/pe/lim/lim_utils.h @@ -1036,12 +1036,14 @@ void lim_log_he_6g_cap(struct mac_context *mac, * lim_log_he_op() - Print HE Operation * @mac: pointer to MAC context * @he_op: pointer to HE Operation + * @session: pointer to PE session * * Print HE operation stored as dot11f structure * * Return: None */ -void lim_log_he_op(struct mac_context *mac, tDot11fIEhe_op *he_ops); +void lim_log_he_op(struct mac_context *mac, tDot11fIEhe_op *he_ops, + struct pe_session *session); #ifdef WLAN_FEATURE_11AX_BSS_COLOR /** @@ -1270,7 +1272,8 @@ static inline void lim_copy_join_req_he_cap(struct pe_session *session, } static inline void lim_log_he_op(struct mac_context *mac, - tDot11fIEhe_op *he_ops) + tDot11fIEhe_op *he_ops, + struct pe_session *session) { } 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 fbda95321cee4..01d33dbc0de81 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 @@ -6084,7 +6084,7 @@ populate_dot11f_he_operation(struct mac_context *mac_ctx, he_op->oper_info_6g.info.dup_bcon = 0; he_op->oper_info_6g.info.min_rate = 0; } - lim_log_he_op(mac_ctx, he_op); + lim_log_he_op(mac_ctx, he_op, session); return QDF_STATUS_SUCCESS; }