From 8c051201d6526754d23759d8da294847fc666f16 Mon Sep 17 00:00:00 2001 From: francescomani Date: Thu, 26 Jan 2023 09:50:18 +0100 Subject: [PATCH] fix for RA NSA --- openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c b/openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c index d766e10ac8..f781777cc7 100644 --- a/openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c +++ b/openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c @@ -3836,7 +3836,7 @@ uint8_t get_pusch_mcs_table(long *mcs_Table, if (*mcs_Table == NR_PUSCH_Config__mcs_Table_qam256) return 1; else - return (2+(is_tp<<1)); + return (2 + (is_tp << 1)); } else { if ((*mcs_Table == NR_PUSCH_Config__mcs_Table_qam256) && @@ -3847,14 +3847,12 @@ uint8_t get_pusch_mcs_table(long *mcs_Table, if ((*mcs_Table == NR_PUSCH_Config__mcs_Table_qam64LowSE) && (target_ss == NR_SearchSpace__searchSpaceType_PR_ue_Specific) && ((rnti_type == NR_RNTI_C ) || (rnti_type == NR_RNTI_SP_CSI))) - return (2+(is_tp<<1)); + return (2 + (is_tp << 1)); if (rnti_type == NR_RNTI_MCS_C) - return (2+(is_tp<<1)); - AssertFatal(1==0,"Invalid configuration to set MCS table"); + return (2 + (is_tp << 1)); } } - else - return (0+(is_tp*3)); + return (0 + (is_tp * 3)); }