maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'eMTC-testing' into eMTC-testing-orange

Browse Source
This commit is contained in:
Louis Adrien Dufrene
2019-02-25 11:28:41 +01:00
parent 1e374fdf60 87f415d2dd
commit f552fd73ba
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
+2 -2
View File
@@ -686,7 +686,7 @@ rx_sdu(const module_id_t enb_mod_idP,
rx_lengths[i], rx_lengths[i],
payload_ptr - sduP); payload_ptr - sduP);
if ((UE_id = add_new_ue(enb_mod_idP, CC_idP, mac->common_channels[CC_idP].ra->rnti, harq_pid if ((UE_id = add_new_ue(enb_mod_idP, CC_idP, ra->rnti, harq_pid
#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0)) #if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
, mac->common_channels[CC_idP].ra->rach_resource_type , mac->common_channels[CC_idP].ra->rach_resource_type
#endif #endif
@@ -1916,7 +1916,7 @@ schedule_ulsch_rnti(module_id_t module_idP,
void schedule_ulsch_rnti_emtc(module_id_t module_idP, void schedule_ulsch_rnti_emtc(module_id_t module_idP,
frame_t frameP, frame_t frameP,
sub_frame_t subframeP, sub_frame_t subframeP,
int sched_subframeP, unsigned char sched_subframeP,
int *emtc_active) int *emtc_active)
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
{ {