Merge remote-tracking branch 'origin/develop' into develop_integration_w50

common/utils/T/T_messages.txt

@@ -423,6 +423,27 @@ ID = LEGACY_ENB_APP_TRACE
     GROUP = ALL:LEGACY_ENB_APP:LEGACY_GROUP_TRACE:LEGACY
     FORMAT = string,log
 
+ID = LEGACY_FLEXRAN_AGENT_INFO
+    DESC = FLEXRAN_AGENT legacy logs - info level
+    GROUP = ALL:LEGACY_FLEXRAN_AGENT:LEGACY_GROUP_INFO:LEGACY
+    FORMAT = string,log
+ID = LEGACY_FLEXRAN_AGENT_ERROR
+    DESC = FLEXRAN_AGENT legacy logs - error level
+    GROUP = ALL:LEGACY_FLEXRAN_AGENT:LEGACY_GROUP_ERROR:LEGACY
+    FORMAT = string,log
+ID = LEGACY_FLEXRAN_AGENT_WARNING
+    DESC = FLEXRAN_AGENT legacy logs - warning level
+    GROUP = ALL:LEGACY_FLEXRAN_AGENT:LEGACY_GROUP_WARNING:LEGACY
+    FORMAT = string,log
+ID = LEGACY_FLEXRAN_AGENT_DEBUG
+    DESC = FLEXRAN_AGENT legacy logs - debug level
+    GROUP = ALL:LEGACY_FLEXRAN_AGENT:LEGACY_GROUP_DEBUG:LEGACY
+    FORMAT = string,log
+ID = LEGACY_FLEXRAN_AGENT_TRACE
+    DESC = FLEXRAN_AGENT legacy logs - trace level
+    GROUP = ALL:LEGACY_FLEXRAN_AGENT:LEGACY_GROUP_TRACE:LEGACY
+    FORMAT = string,log
+
 ID = LEGACY_SCTP_INFO
     DESC = SCTP legacy logs - info level
     GROUP = ALL:LEGACY_SCTP:LEGACY_GROUP_INFO:LEGACY

openair1/PHY/LTE_TRANSPORT/ulsch_decoding.c

@@ -1442,7 +1442,7 @@ unsigned int  ulsch_decoding(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc,
     }
 
 #if defined(__x86_64__)||defined(__i386__)
-#ifndef __AVX2
+#ifndef __AVX2__
     for (iprime=0; iprime<G;iprime+=8,j2+=8)
       *((__m128i *)&ulsch_harq->e[iprime]) = *((__m128i *)&y[j2]);
 #else

openair2/LAYER2/MAC/flexran_agent_scheduler_dataplane.c

@@ -303,7 +303,7 @@ void flexran_apply_ue_spec_scheduling_decisions(mid_t mod_id,
 	if (opt_enabled == 1) {
 	  trace_pdu(1, (uint8_t *)UE_list->DLSCH_pdu[CC_id][0][UE_id].payload[0],
 		    TBS, mod_id, 3, UE_RNTI(mod_id, UE_id),
-		    eNB->subframe,0,0);
+		    eNB->frame, eNB->subframe,0,0);
 	  LOG_D(OPT,"[eNB %d][DLSCH] CC_id %d Frame %d  rnti %x  with size %d\n",
 		mod_id, CC_id, frame, UE_RNTI(mod_id,UE_id), TBS);
 	}