cc_worker,proc_ra: set RNTI type for UL grant contained in RAR

needed for HARQ to correctly pick up the Msg3 Tx
master
Andre Puschmann 4 years ago
parent 3e1998b2aa
commit bf4d0121dd

@ -369,6 +369,7 @@ bool cc_worker::work_ul()
mac_ul_grant.tbs = pusch_cfg.grant.tb[0].tbs / 8; mac_ul_grant.tbs = pusch_cfg.grant.tb[0].tbs / 8;
mac_ul_grant.ndi = pusch_cfg.grant.tb[0].ndi; mac_ul_grant.ndi = pusch_cfg.grant.tb[0].ndi;
mac_ul_grant.rv = pusch_cfg.grant.tb[0].rv; mac_ul_grant.rv = pusch_cfg.grant.tb[0].rv;
mac_ul_grant.is_rar_grant = (pusch_cfg.grant.rnti_type == srsran_rnti_type_ra);
phy->stack->new_grant_ul(0, mac_ul_grant, &ul_action); phy->stack->new_grant_ul(0, mac_ul_grant, &ul_action);
// Don't process further if MAC can't provide PDU // Don't process further if MAC can't provide PDU

@ -205,7 +205,7 @@ void proc_ra_nr::ra_response_reception(const mac_interface_phy_nr::mac_nr_grant_
temp_crnti = subpdu.get_temp_crnti(); temp_crnti = subpdu.get_temp_crnti();
// Set Temporary-C-RNTI if provided, otherwise C-RNTI is ok // Set Temporary-C-RNTI if provided, otherwise C-RNTI is ok
phy->set_ul_grant(subpdu.get_ul_grant(), temp_crnti, srsran_rnti_type_c); phy->set_ul_grant(subpdu.get_ul_grant(), temp_crnti, srsran_rnti_type_ra);
// reset all parameters that are used before rar // reset all parameters that are used before rar
rar_rnti = SRSRAN_INVALID_RNTI; rar_rnti = SRSRAN_INVALID_RNTI;

Loading…
Cancel
Save