mirror of https://github.com/PentHertz/srsLTE.git
nr,rrc: defer drb activation in NR to when the C-RNTI is received
This commit is contained in:
parent
cbb709d4e3
commit
3119214124
|
@ -139,7 +139,6 @@ uint16_t mac_nr::reserve_rnti(uint32_t enb_cc_idx)
|
||||||
|
|
||||||
// Add new user to the scheduler so that it can RX/TX SRB0
|
// Add new user to the scheduler so that it can RX/TX SRB0
|
||||||
srsenb::sched_nr_interface::ue_cfg_t ue_cfg = srsenb::get_default_ue_cfg(1);
|
srsenb::sched_nr_interface::ue_cfg_t ue_cfg = srsenb::get_default_ue_cfg(1);
|
||||||
ue_cfg.ue_bearers[0].direction = mac_lc_ch_cfg_t::IDLE;
|
|
||||||
sched.ue_cfg(rnti, ue_cfg);
|
sched.ue_cfg(rnti, ue_cfg);
|
||||||
|
|
||||||
return rnti;
|
return rnti;
|
||||||
|
|
|
@ -1309,6 +1309,12 @@ void rrc_nr::ue::crnti_ce_received()
|
||||||
if (endc) {
|
if (endc) {
|
||||||
// send SgNB addition complete for ENDC users
|
// send SgNB addition complete for ENDC users
|
||||||
parent->rrc_eutra->sgnb_addition_complete(eutra_rnti, rnti);
|
parent->rrc_eutra->sgnb_addition_complete(eutra_rnti, rnti);
|
||||||
|
|
||||||
|
// Add DRB1 to MAC
|
||||||
|
for (auto& drb : cell_group_cfg.rlc_bearer_to_add_mod_list) {
|
||||||
|
uecfg.ue_bearers[drb.lc_ch_id].direction = mac_lc_ch_cfg_t::BOTH;
|
||||||
|
}
|
||||||
|
parent->mac->ue_cfg(rnti, uecfg);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1389,9 +1395,7 @@ int rrc_nr::ue::add_drb()
|
||||||
srsran::pdcp_config_t pdcp_cnfg = srsran::make_drb_pdcp_config_t(drb_item.drb_id, false, drb_item.pdcp_cfg);
|
srsran::pdcp_config_t pdcp_cnfg = srsran::make_drb_pdcp_config_t(drb_item.drb_id, false, drb_item.pdcp_cfg);
|
||||||
parent->pdcp->add_bearer(rnti, rlc.lc_ch_id, pdcp_cnfg);
|
parent->pdcp->add_bearer(rnti, rlc.lc_ch_id, pdcp_cnfg);
|
||||||
|
|
||||||
// Add DRB1 to MAC
|
// Note: DRB1 is only activated in the MAC when the C-RNTI CE is received
|
||||||
uecfg.ue_bearers[rlc.lc_ch_id].direction = mac_lc_ch_cfg_t::BOTH;
|
|
||||||
parent->mac->ue_cfg(rnti, uecfg);
|
|
||||||
|
|
||||||
return SRSRAN_SUCCESS;
|
return SRSRAN_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue