Merge remote-tracking branch 'origin/new-gtpu' into integration_2020_wk15

Conflicts:
	cmake_targets/CMakeLists.txt
	openair1/PHY/TOOLS/time_meas.h
	openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
	openair2/LAYER2/RLC/rlc.h

targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp

@@ -1329,7 +1329,7 @@ extern "C" {
   if(is_equal(s->sample_rate, (double)7.68e6))
     s->tx_forward_nsamps = 50;
   
-  
+		   
   if (device->recplay_state != NULL) { // record mode
     device->recplay_state->ms_sample = (iqrec_t *) malloc(openair0_cfg[0].recplay_conf->u_sf_max * sizeof(iqrec_t));
   

targets/COMMON/create_tasks.c

@@ -42,6 +42,7 @@
 # include "enb_app.h"
 # include "openair2/LAYER2/MAC/mac_proto.h"
 #include <executables/split_headers.h> 
+#include <openair3/ocp-gtpu/gtp_itf.h>
 
 extern RAN_CONTEXT_t RC;
 

targets/COMMON/create_tasks_mbms.c

@@ -47,6 +47,7 @@
 # include "mce_app.h"
 # include "mme_app.h"
 
+#include <openair3/ocp-gtpu/gtp_itf.h>
 //extern RAN_CONTEXT_t RC;
 
 int create_tasks_mbms(uint32_t enb_nb) {

targets/RT/USER/lte-softmodem.c

@@ -175,7 +175,6 @@ extern void init_eNB_afterRU(void);
 int transmission_mode=1;
 int emulate_rf = 0;
 int numerology = 0;
-int usrp_tx_thread = 0;
 
 THREAD_STRUCT thread_struct;
 /* struct for ethernet specific parameters given in eNB conf file */

targets/RT/USER/lte-uesoftmodem.c

@@ -169,7 +169,6 @@ extern void get_uethreads_params(void);
 
 int transmission_mode=1;
 
-int usrp_tx_thread = 0;
 
 
 char *usrp_args=NULL;