fix merge

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c

@@ -720,7 +720,6 @@ void nr_rx_sdu(const module_id_t gnb_mod_idP,
         if (!UE_msg3_stage) {
           LOG_W(NR_MAC, "Random Access %i discarded at state %i (TC_RNTI %04x RNTI %04x): max number of users achieved!\n", i, ra->state, ra->rnti, current_rnti);
 
-          nr_mac_remove_ra_rnti(gnb_mod_idP, ra->rnti);
           nr_clear_ra_proc(gnb_mod_idP, CC_idP, frameP, ra);
           return;
         }
@@ -758,7 +757,6 @@ void nr_rx_sdu(const module_id_t gnb_mod_idP,
           UE_scheduling_control->pusch_consecutive_dtx_cnt = 0;
           UE_scheduling_control->ul_failure = 0;
           UE_msg3_stage->ra_timer = 0;
-          nr_mac_remove_ra_rnti(gnb_mod_idP, ra->rnti);
           nr_clear_ra_proc(gnb_mod_idP, CC_idP, frameP, ra);
           process_CellGroup(ra->CellGroup, UE_scheduling_control);
 

openair2/LAYER2/NR_MAC_gNB/mac_proto.h

@@ -351,8 +351,6 @@ NR_UE_info_t* add_new_nr_ue(gNB_MAC_INST *nr_mac, rnti_t rntiP, NR_CellGroupConf
 
 void mac_remove_nr_ue(gNB_MAC_INST *nr_mac, rnti_t rnti);
 
-void nr_mac_remove_ra_rnti(module_id_t mod_id, rnti_t rnti);
-
 int nr_get_default_pucch_res(int pucch_ResourceCommon);
 
 int get_dlscs(nfapi_nr_config_request_t *cfg);