fix for RA in assertion and config file merge issue

openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c

@@ -944,8 +944,9 @@ int8_t nr_ue_process_dci(module_id_t module_id, int cc_id, uint8_t gNB_index, fr
       return -1;
     }
 
-   AssertFatal(1+dci->pdsch_to_harq_feedback_timing_indicator.val>=DURATION_RX_TO_TX,"PDSCH to HARQ feedback time (%d) cannot be less than DURATION_RX_TO_TX (%d).\n",
-               1+dci->pdsch_to_harq_feedback_timing_indicator.val,DURATION_RX_TO_TX);
+   if(rnti != ra->ra_rnti && rnti != SI_RNTI)
+     AssertFatal(1+dci->pdsch_to_harq_feedback_timing_indicator.val>=DURATION_RX_TO_TX,"PDSCH to HARQ feedback time (%d) cannot be less than DURATION_RX_TO_TX (%d).\n",
+                 1+dci->pdsch_to_harq_feedback_timing_indicator.val,DURATION_RX_TO_TX);
 
    // set the harq status at MAC for feedback
    set_harq_status(mac,dci->pucch_resource_indicator,