Fix merge conflict resolution error.

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-07-24 08:59:13 +02:00
parent 729aab5798
commit 0f91d708bd
1 changed files with 1 additions and 2 deletions
@@ -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,