Merge branch 'enhancement-10-harmony' of https://gitlab.eurecom.fr/oai/openairinterface5g into enhancement-10-harmony

Conflicts: openair1/PHY/LTE_TRANSPORT/prach.c openair1/SCHED/phy_procedures_lte_eNb.c targets/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.c targets/RT/USER/lte-enb.c
2016-08-04 01:54:18 +02:00
parent af3bbe425e 240d8b9512
commit f63ee88c89
13 changed files with 457 additions and 332 deletions
@@ -224,7 +224,8 @@ int trx_eth_write_raw_IF4p5(openair0_device *device, openair0_timestamp timestam
  eth->tx_nsamps = nblocks;
  
  memcpy(buff[0], (void*)&eth->eh, MAC_HEADER_SIZE_BYTES);	
-         
+
+
  bytes_sent = send(eth->sockfd[Mod_id],
                    buff[0], 
                    packet_size,