Skip to content
  • chia-yu chang's avatar
    Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g... · 1b417979
    chia-yu chang authored
    Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into various-l2-fixes-187
    
    Conflicts:
    	openair1/PHY/LTE_TRANSPORT/if4_tools.c
    	targets/ARCH/ETHERNET/USERSPACE/LIB/eth_udp.c
    	targets/ARCH/ETHERNET/USERSPACE/LIB/if_defs.h
    	targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.if4p5.25PRB.lo.conf
    	targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.if4p5.50PRB.lo.conf
    	targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.if4p5.50PRB.usrpb210.conf
    	targets/PROJECTS/GENERIC-LTE-EPC/CONF/rru.band7.tm1.if4p5.25PRB.oaisim.conf
    	targets/PROJECTS/GENERIC-LTE-EPC/CONF/rru.band7.tm1.if4p5.50PRB.oaisim.conf
    1b417979