Fixing merge request comments

openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c

@@ -259,9 +259,6 @@ void ue_dci_configuration(NR_UE_MAC_INST_t *mac, fapi_nr_dl_config_request_t *dl
   //NR_ServingCellConfig_t *scd = mac->scg->spCellConfig->spCellConfigDedicated;
   NR_BWP_DownlinkDedicated_t *bwpd  = (bwp_id>0) ? mac->DLbwp[bwp_id-1]->bwp_Dedicated : mac->cg->spCellConfig->spCellConfigDedicated->initialDownlinkBWP;
   NR_BWP_DownlinkCommon_t *bwp_Common = (bwp_id>0) ? mac->DLbwp[bwp_id-1]->bwp_Common : &mac->scc_SIB->downlinkConfigCommon.initialDownlinkBWP;
-  fapi_nr_dl_config_dci_dl_pdu_rel15_t *rel15 = &dl_config->dl_config_list[dl_config->number_pdus].dci_config_pdu.dci_config_rel15;
-  NR_SetupRelease_PDCCH_ConfigCommon_t *pdcch_ConfigCommon = bwp_Common->pdcch_ConfigCommon;
-  struct NR_PhysicalCellGroupConfig *phy_cgc = (mac->cg) ? mac->cg->physicalCellGroupConfig : NULL;
 
   LOG_D(NR_MAC, "[DCI_CONFIG] ra_rnti %p (%x) crnti %p (%x) t_crnti %p (%x)\n", &ra->ra_rnti, ra->ra_rnti, &mac->crnti, mac->crnti, &ra->t_crnti, ra->t_crnti);
 
@@ -270,6 +267,9 @@ void ue_dci_configuration(NR_UE_MAC_INST_t *mac, fapi_nr_dl_config_request_t *dl
       for (ss_id = 0; ss_id < FAPI_NR_MAX_SS_PER_CORESET && mac->SSpace[bwp_id][coreset_id - 1][ss_id] != NULL; ss_id++){
 	LOG_D(NR_MAC, "[DCI_CONFIG] ss_id %d\n",ss_id);
 	NR_SearchSpace_t *ss = mac->SSpace[bwp_id][coreset_id - 1][ss_id];
+	fapi_nr_dl_config_dci_dl_pdu_rel15_t *rel15 = &dl_config->dl_config_list[dl_config->number_pdus].dci_config_pdu.dci_config_rel15;
+	NR_SetupRelease_PDCCH_ConfigCommon_t *pdcch_ConfigCommon = bwp_Common->pdcch_ConfigCommon;
+	struct NR_PhysicalCellGroupConfig *phy_cgc = mac->cg->physicalCellGroupConfig;
 	switch (ss->searchSpaceType->present){
 	case NR_SearchSpace__searchSpaceType_PR_common:
 	  // this is for CSSs, we use BWP common and pdcch_ConfigCommon
@@ -414,6 +414,8 @@ void ue_dci_configuration(NR_UE_MAC_INST_t *mac, fapi_nr_dl_config_request_t *dl
   }
   // Search space 0, CORESET ID 0
 
+  NR_SetupRelease_PDCCH_ConfigCommon_t *pdcch_ConfigCommon = bwp_Common->pdcch_ConfigCommon;
+
   if (pdcch_ConfigCommon &&
       pdcch_ConfigCommon->choice.setup->searchSpaceSIB1 &&
       !get_softmodem_params()->nsa) {

openair2/NR_PHY_INTERFACE/NR_IF_Module.c

@@ -155,13 +155,11 @@ void handle_nr_uci(NR_UL_IND_t *UL_info)
         if (uci_list[i].pucch_pdu_format_0_1.harq) {
           free(uci_list[i].pucch_pdu_format_0_1.harq->harq_list);
           uci_list[i].pucch_pdu_format_0_1.harq->harq_list = NULL;
+        }
         free(uci_list[i].pucch_pdu_format_0_1.harq);
         uci_list[i].pucch_pdu_format_0_1.harq = NULL;
-        }
-        if (uci_list[i].pucch_pdu_format_0_1.sr) {
         free(uci_list[i].pucch_pdu_format_0_1.sr);
         uci_list[i].pucch_pdu_format_0_1.sr = NULL;
-        }
         break;
 
       case NFAPI_NR_UCI_FORMAT_2_3_4_PDU_TYPE:

openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.c

@@ -737,16 +737,12 @@ static void enqueue_nr_nfapi_msg(void *buffer, ssize_t len, nfapi_p7_message_hea
                 LOG_D(NR_MAC, "We added UL_TTI_REQ to queue for sfn slot %d %d\n",
                       ul_tti_request->SFN, ul_tti_request->Slot);
                 if (!put_queue(&nr_ul_tti_req_queue, ul_tti_request))
-                {
-                    reset_queue(&nr_ul_tti_req_queue);
-                    if (!put_queue(&nr_ul_tti_req_queue, ul_tti_request))
                 {
                     LOG_E(NR_PHY, "put_queue failed for ul_tti_request.\n");
                     free(ul_tti_request);
                     ul_tti_request = NULL;
                 }
             }
-            }
             /* TODO: This indicates that dl_tti_req was late or never arrived. If there are
                not any prepared uci indications, the NRUE likely never had time to
                populate the message is the dl_tti_req came in late and we received a