Merge branch 'eurecom-episys-merge-nsa' into origin-episys-merge-nsa

nfapi/open-nFAPI/pnf/src/pnf_p7.c

@@ -3264,10 +3264,6 @@ int pnf_nr_p7_message_pump(pnf_p7_t* pnf_p7)
 
 	struct timespec pselect_start;
 
-	struct timespec timeout;
-	timeout.tv_sec = 0;
-	timeout.tv_nsec = 500000;
-
 	struct timespec slot_duration;
 	slot_duration.tv_sec = 0;
 	slot_duration.tv_nsec = 0.5e6;
@@ -3283,6 +3279,9 @@ int pnf_nr_p7_message_pump(pnf_p7_t* pnf_p7)
 		FD_ZERO(&rfds);
 		FD_SET(pnf_p7->p7_sock, &rfds);
 
+		struct timespec timeout;
+		timeout.tv_sec = 100;
+		timeout.tv_nsec = 0;
 		clock_gettime(CLOCK_MONOTONIC, &pselect_start);
 
 		//setting the timeout

openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.c

@@ -905,6 +905,7 @@ int nr_ue_dl_indication(nr_downlink_indication_t *dl_info, NR_UL_TIME_ALIGNMENT_
         dci_pdu_rel15_t *def_dci_pdu_rel15 = &mac->def_dci_pdu_rel15[dci_index->dci_format];
         g_harq_pid = def_dci_pdu_rel15->harq_pid;
         LOG_D(NR_MAC, "Setting harq_pid = %d and dci_index = %d (based on format)\n", g_harq_pid, dci_index->dci_format);
+        memset(def_dci_pdu_rel15, 0, sizeof(*def_dci_pdu_rel15));
 
         ret_mask |= (ret << FAPI_NR_DCI_IND);
         if (ret >= 0) {