Fix merge conflict resolution error.
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
This commit is contained in:
@@ -473,7 +473,6 @@ 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;
|
||||||
|
|||||||
Reference in New Issue
Block a user