Skip to content

O
OpenXG-RAN
Commit 62d5e139 authored by Y_Tomita's avatar Y_Tomita
Browse files
Options

Fixed conflict file.

parents a607dd5b 8a1428dc
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
openair2/LAYER2/PDCP_v10.1.0/pdcp.c
View file @ 62d5e139
...@@ -67,6 +67,7 @@ extern int otg_enabled; ...@@ -67,6 +67,7 @@ extern int otg_enabled;
#include "common/ran_context.h" #include "common/ran_context.h"
extern RAN_CONTEXT_t RC; extern RAN_CONTEXT_t RC;
hash_table_t *pdcp_coll_p = NULL;
#ifdef MBMS_MULTICAST_OUT #ifdef MBMS_MULTICAST_OUT
# include <sys/types.h> # include <sys/types.h>
...@@ -79,7 +80,6 @@ extern RAN_CONTEXT_t RC; ...@@ -79,7 +80,6 @@ extern RAN_CONTEXT_t RC;
static int mbms_socket = -1; static int mbms_socket = -1;
#endif #endif
hash_table_t *pdcp_coll_p = NULL;
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
/* /*
* If PDCP_UNIT_TEST is set here then data flow between PDCP and RLC is broken * If PDCP_UNIT_TEST is set here then data flow between PDCP and RLC is broken
......
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