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

Fix merge conflict resolution error.

Browse Source 
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
This commit is contained in:
Raphael Defosseux
2019-07-24 08:59:13 +02:00
parent 729aab5798
commit 0f91d708bd
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
+1 -2
View File
@@ -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,