Merge remote-tracking branch 'origin/episys/master-nsa' into episys/david/nsa_ci_debug_for_sa

ci-scripts/conf_files/episci/episci_gnb.band78.sa.fr1.106PRB.usrpn310.conf

@@ -215,10 +215,10 @@ gNBs =
 
     NETWORK_INTERFACES :
     {
-        GNB_INTERFACE_NAME_FOR_NG_AMF            = "lo:";
-        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "127.0.0.2";
-        GNB_INTERFACE_NAME_FOR_NGU               = "lo:";
-        GNB_IPV4_ADDRESS_FOR_NGU                 = "127.0.0.2";
+        GNB_INTERFACE_NAME_FOR_NG_AMF            = "ctrl0";
+        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "172.16.0.1";
+        GNB_INTERFACE_NAME_FOR_NGU               = "ctrl0";
+        GNB_IPV4_ADDRESS_FOR_NGU                 = "172.16.0.1";
         GNB_PORT_FOR_NGU                         = 2152; # Spec 2152
     };
 

openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.c

@@ -708,7 +708,7 @@ void check_and_process_dci(nfapi_nr_dl_tti_request_t *dl_tti_request,
                           mac->scc_SIB->tdd_UL_DL_ConfigurationCommon,
                           ul_info.slot_tx,
                           mac->frame_type))
-        nr_ue_ul_indication(&ul_info);
+            nr_ue_ul_indication(&ul_info);
     }
 }