Merge branch 'gNB_mwc18_integration' of...

Merge branch 'gNB_mwc18_integration' of https://gitlab.eurecom.fr/oai-nr/openairinterface5g into gNB_mwc18_integration

openair2/LAYER2/MAC/eNB_scheduler_phytest.c

@@ -71,7 +71,7 @@ schedule_ue_spec_phy_test(
   uint16_t                       rnti      = 0x1235;
   uint32_t                       rb_alloc  = 0x1FFFFFFF;
   int32_t                        tpc       = 1;
-  int32_t                        mcs       = 28;
+  int32_t                        mcs       = 0;
   int32_t                        cqi       = 15;
   int32_t                        ndi       = subframeP/5;
   int32_t                        dai       = 0;

targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.100PRB.usrpx310.conf

@@ -150,17 +150,10 @@ eNBs =
     NETWORK_INTERFACES :
     {
 
-<<<<<<< HEAD
         ENB_INTERFACE_NAME_FOR_S1_MME            = "em1";
         ENB_IPV4_ADDRESS_FOR_S1_MME              = "192.168.12.155/24";
         ENB_INTERFACE_NAME_FOR_S1U               = "em1";
         ENB_IPV4_ADDRESS_FOR_S1U                 = "192.168.12.155/24";
-=======
-        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth6";
-        ENB_IPV4_ADDRESS_FOR_S1_MME              = "192.168.12.111/24";
-        ENB_INTERFACE_NAME_FOR_S1U               = "eth6";
-        ENB_IPV4_ADDRESS_FOR_S1U                 = "192.168.12.111/24";
->>>>>>> RU-RAU-split-parallel-EMUFH
         ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
     };
   }

targets/RT/USER/lte-softmodem.c

@@ -209,7 +209,7 @@ extern void reset_opp_meas(void);
 extern void print_opp_meas(void);
 
 int transmission_mode=1;
-int numerology = 0;
+int numerology = 2;
 int codingw = 1;
 int fepw = 1;