• knopp's avatar
    Merge after bad rebase · 1fc396f5
    knopp authored
    Merge branch 'bugfix-48-L1L2signaling' of https://gitlab.eurecom.fr/oai/openairinterface5g into bugfix-48-L1L2signaling
    
    Conflicts:
    	openair1/PHY/LTE_TRANSPORT/dlsch_llr_computation.c
    	openair1/SCHED/phy_procedures_lte_ue.c
    	openair2/LAYER2/MAC/eNB_scheduler.c
    	openair2/LAYER2/MAC/eNB_scheduler_RA.c
    	openair2/LAYER2/MAC/eNB_scheduler_bch.c
    	openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
    	openair2/LAYER2/MAC/eNB_scheduler_primitives.c
    	openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
    	openair2/LAYER2/MAC/proto.h
    	openair2/PHY_INTERFACE/defs.h
    1fc396f5
dlsch_llr_computation.c 425 KB