PentHertz
/
srsLTE
mirror of https://github.com/PentHertz/srsLTE.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix conflicts in rebasing

This commit is contained in:
Francisco Paisana 2021-09-23 19:11:31 +02:00 committed by Andre Puschmann
parent bdf18856d1
commit d1b1ef181a
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
srsenb/src/stack/mac/nr/mac_nr.cc
View File

@ -130,12 +130,6 @@ int mac_nr::ue_cfg(uint16_t rnti, const sched_nr_interface::ue_cfg_t& ue_cfg)
return SRSRAN_SUCCESS;
}
int mac_nr::rlc_buffer_state(uint16_t rnti, uint32_t lcid, uint32_t tx_queue, uint32_t retx_queue)
{
sched.dl_buffer_state(rnti, lcid, tx_queue, retx_queue);
return SRSRAN_SUCCESS;
}
uint16_t mac_nr::reserve_rnti(uint32_t enb_cc_idx)
{
uint16_t rnti = alloc_ue(enb_cc_idx);