Merge branch 'next' into raa

lib/test/upper/rlc_am_stress_test.cc

@@ -213,7 +213,7 @@ void stress_test()
   log1.set_hex_limit(-1);
   log2.set_hex_limit(-1);
 
-  float fail_rate = 0.01;
+  float fail_rate = 0.1;
 
   rlc rlc1;
   rlc rlc2;
@@ -224,7 +224,7 @@ void stress_test()
   ue_interface  ue;
 
   rlc1.init(&tester1, &tester1, &ue, &log1, &mac, 0);
-  rlc2.init(&tester1, &tester1, &ue, &log2, &mac, 0);
+  rlc2.init(&tester2, &tester2, &ue, &log2, &mac, 0);
 
   LIBLTE_RRC_RLC_CONFIG_STRUCT cnfg;
   cnfg.rlc_mode = LIBLTE_RRC_RLC_MODE_AM;
@@ -241,7 +241,7 @@ void stress_test()
   rlc2.add_bearer(1, cnfg_);
 
   tester1.start(7);
-  //tester2.start(7);
+  tester2.start(7);
   mac.start();
 
   usleep(100e6);

srsue/src/upper/rrc.cc

@@ -1770,9 +1770,9 @@ void rrc::apply_rr_config_common_dl(LIBLTE_RRC_RR_CONFIG_COMMON_STRUCT *config)
   mac->get_config(&mac_cfg);
   if (config->rach_cnfg_present) {
     memcpy(&mac_cfg.rach, &config->rach_cnfg, sizeof(LIBLTE_RRC_RACH_CONFIG_COMMON_STRUCT));
+    mac_cfg.ul_harq_params.max_harq_msg3_tx = config->rach_cnfg.max_harq_msg3_tx;
   }
   mac_cfg.prach_config_index = config->prach_cnfg.root_sequence_index;
-  mac_cfg.ul_harq_params.max_harq_msg3_tx = config->rach_cnfg.max_harq_msg3_tx;
 
   mac->set_config(&mac_cfg);