# Conflicts:
#	executables/nr-uesoftmodem.c
#	executables/nr-uesoftmodem.h
#	executables/softmodem-common.h
#	openair2/LAYER2/NR_MAC_UE/mac_proto.h
#	openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
#	openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c

MR !1245: [CI] Improve Iperf packet loss mismatch detection
-improve the Iperf packet loss detection and flagging when pl target (from xml) is below the test result

MR !1246: patch: remove call to end_configmodule
- full fix that set properly PARAMFLAG_NOFREE on relevant parameters

MR !1235: Nr msg4 retransmission
-Retransmission of msg4
-Some reworking in UE harq DLSCH processing

MR !1214: NR UE SA
-SIB1 detection part of initial sync at UE
-Removing a lot of hard-coding in SA procedures
-SSB start subcarrier from command line at UE

MR !1243: Nr skip mac pdu processing when nack
-Skipping processing DLSCH MAC PDU at OAI UE when NACK

MR !1229: fix(nr-ue): apply ip rules/route
-Also added 4G RF sim tests

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>

Merge remote-tracking branch 'origin/NR_skip_mac_pdu_processing_when_nack' into integration_2021_wk35

# Conflicts:
#	executables/nr-uesoftmodem.c
#	executables/nr-uesoftmodem.h
#	executables/softmodem-common.h
#	openair1/PHY/MODULATION/slot_fep_nr.c
#	openair1/PHY/NR_ESTIMATION/nr_ul_channel_estimation.c
#	openair1/SCHED_NR/fapi_nr_l1.c
#	openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
#	openair2/LAYER2/NR_MAC_UE/mac_proto.h
#	openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c
#	openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c

comment out end_configmodule meanwhile someone verify all parameters that should have PARAMFLAG_NOFREE

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>

Merge branch 'bandwidth-testing' of https://gitlab.eurecom.fr/oai/openairinterface5g into bandwidth-testing

Merge branch 'bandwidth-testing' of https://gitlab.eurecom.fr/oai/openairinterface5g into bandwidth-testing

Conflicts:
	executables/nr-ru.c
	openair1/PHY/NR_TRANSPORT/nr_dci.c
	openair1/PHY/NR_TRANSPORT/nr_dci_tools.c

  -- Reduce required BW test in 4G RF sim

Docker:
  -- Made the "Thread Parallel Config" a flexible parameter
     default is SINGLE_THREAD
  -- Clean Up on some Docker file about pyyaml
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>

MR !1081 : Prb based channel estimation
-An option for using average channel estimates over 1 prb is introduced in DLSCH and ULSCH. 
This improved BLER performance for MCS 28 when prbs are allocated across DC.

MR !1231 : Nr msg3 retransmission
-Implement re-transmission of MSG3 gNB and UE
-Fixes content resolution timer at UE

MR !1236 : nr: add T trace for msg4 (rrc setup)