From 0f91d708bd098ec39f0bf19f6feb8c5c8c9db9f0 Mon Sep 17 00:00:00 2001
From: Raphael Defosseux <raphael.defosseux@eurecom.fr>
Date: Wed, 24 Jul 2019 08:59:13 +0200
Subject: [PATCH] Fix merge conflict resolution error.
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
---
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/openair2/LAYER2/MAC/eNB_scheduler_ulsch.c b/openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
index 13736b4def..be1f838aaa 100644
--- a/openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
+++ b/openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
@@ -473,9 +473,8 @@ rx_sdu(const module_id_t enb_mod_idP,
,ra->rach_resource_type > 0
#endif
);
- if (ret == 0) {
/* Received a new rnti */
- if(ret == 0){
+ if (ret == 0) {
ra->state = MSGCRNTI;
LOG_I(MAC, "[eNB %d] Frame %d, Subframe %d CC_id %d : (rnti %x UE_id %d) Received rnti(Msg4)\n",
enb_mod_idP,
--
GitLab