Merge remote-tracking branch 'origin/t-reordering-gt-0' into integration_2022_wk11

ci-scripts/xml_files/container_nsa_b200_quectel.xml

@@ -185,8 +185,8 @@
 
 	<testCase id="070000">
 		<class>Iperf</class>
-		<desc>iperf (DL/125Mbps/UDP)(60 sec)(single-ue profile)</desc>
-		<iperf_args>-u -b 125M -t 60 -i 1 -fm</iperf_args>
+		<desc>iperf (DL/90Mbps/UDP)(60 sec)(single-ue profile)</desc>
+		<iperf_args>-u -b 90M -t 60 -i 1 -fm</iperf_args>
 		<direction>DL</direction>
 		<id>idefix</id>
 		<iperf_packetloss_threshold>25</iperf_packetloss_threshold>

ci-scripts/xml_files/fr1_sa_quectel.xml

@@ -166,8 +166,8 @@
 		<eNB_instance>0</eNB_instance>
 		<eNB_serverId>0</eNB_serverId>
 		<air_interface>nr</air_interface>
-		<d_retx_th>5,50,100,100</d_retx_th>
-		<u_retx_th>5,50,100,100</u_retx_th>
+		<d_retx_th>5,80,100,100</d_retx_th>
+		<u_retx_th>5,80,100,100</u_retx_th>
 	</testCase>
 
 </testCaseList>

ci-scripts/xml_files/fr1_sa_quectel_162prb.xml

@@ -119,8 +119,8 @@
 
 	<testCase id="072000">
 		<class>Iperf</class>
-		<desc>iperf (DL/200Mbps/UDP)(60 sec)(single-ue profile)</desc>
-		<iperf_args>-u -b 200M -t 60</iperf_args>
+		<desc>iperf (DL/180Mbps/UDP)(60 sec)(single-ue profile)</desc>
+		<iperf_args>-u -b 180M -t 60</iperf_args>
 		<direction>DL</direction>
 		<id>nrmodule2_quectel</id>
 		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
@@ -155,8 +155,8 @@
 		<eNB_instance>0</eNB_instance>
 		<eNB_serverId>0</eNB_serverId>
 		<air_interface>nr</air_interface>
-		<d_retx_th>5,50,100,100</d_retx_th>
-		<u_retx_th>5,50,100,100</u_retx_th>
+		<d_retx_th>5,80,100,100</d_retx_th>
+		<u_retx_th>5,80,100,100</u_retx_th>
 	</testCase>
 
 </testCaseList>

ci-scripts/xml_files/fr1_sa_quectel_stages.xml

@@ -193,8 +193,8 @@
 		<eNB_instance>0</eNB_instance>
 		<eNB_serverId>0</eNB_serverId>
 		<air_interface>nr</air_interface>
-		<d_retx_th>5,50,100,100</d_retx_th>
-		<u_retx_th>5,50,100,100</u_retx_th>
+		<d_retx_th>5,80,100,100</d_retx_th>
+		<u_retx_th>5,80,100,100</u_retx_th>
 	</testCase>
 
 </testCaseList>

openair2/RRC/NR/rrc_gNB_radio_bearers.c

@@ -85,7 +85,7 @@ NR_DRB_ToAddMod_t *generateDRB(gNB_RRC_UE_t *ue, uint8_t drb_id, pdu_session_par
   DRB_config->pdcp_Config->moreThanOneRLC            = NULL;
   
   DRB_config->pdcp_Config->t_Reordering  = calloc(1, sizeof(*DRB_config->pdcp_Config->t_Reordering));
-  *DRB_config->pdcp_Config->t_Reordering = NR_PDCP_Config__t_Reordering_ms0;
+  *DRB_config->pdcp_Config->t_Reordering = NR_PDCP_Config__t_Reordering_ms100;
   DRB_config->pdcp_Config->ext1          = NULL;
   
   if (do_drb_integrity) {

openair2/RRC/NR/rrc_gNB_reconfig.c

@@ -499,7 +499,7 @@ void fill_default_rbconfig(NR_RadioBearerConfig_t *rbconfig,
   drb_ToAddMod->pdcp_Config->moreThanOneRLC = NULL;
 
   drb_ToAddMod->pdcp_Config->t_Reordering = calloc(1,sizeof(*drb_ToAddMod->pdcp_Config->t_Reordering));
-  *drb_ToAddMod->pdcp_Config->t_Reordering = NR_PDCP_Config__t_Reordering_ms0;
+  *drb_ToAddMod->pdcp_Config->t_Reordering = NR_PDCP_Config__t_Reordering_ms100;
   drb_ToAddMod->pdcp_Config->ext1 = NULL;
 
   asn1cSeqAdd(&rbconfig->drb_ToAddModList->list,drb_ToAddMod);