Skip to content

O
OpenXG-RAN
Commit 0f91d708 authored by Raphael Defosseux's avatar Raphael Defosseux
Browse files
Options

Fix merge conflict resolution error. 

Signed-off-by: default avatarRaphael Defosseux <raphael.defosseux@eurecom.fr>
parent 729aab57
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 2 deletions
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
View file @ 0f91d708
...@@ -473,9 +473,8 @@ rx_sdu(const module_id_t enb_mod_idP, ...@@ -473,9 +473,8 @@ rx_sdu(const module_id_t enb_mod_idP,
,ra->rach_resource_type > 0 ,ra->rach_resource_type > 0
#endif #endif
); );
if (ret == 0) {
/* Received a new rnti */ /* Received a new rnti */
if(ret == 0){ if (ret == 0) {
ra->state = MSGCRNTI; ra->state = MSGCRNTI;
LOG_I(MAC, "[eNB %d] Frame %d, Subframe %d CC_id %d : (rnti %x UE_id %d) Received rnti(Msg4)\n", LOG_I(MAC, "[eNB %d] Frame %d, Subframe %d CC_id %d : (rnti %x UE_id %d) Received rnti(Msg4)\n",
enb_mod_idP, enb_mod_idP,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment