Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG-RAN
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wangjie
OpenXG-RAN
Commits
103fc806
Commit
103fc806
authored
Dec 03, 2020
by
matzakos
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove hack in LTE PDCP for noS1 mode
parent
dfb110bf
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
10 deletions
+1
-10
openair2/LAYER2/PDCP_v10.1.0/pdcp.c
openair2/LAYER2/PDCP_v10.1.0/pdcp.c
+1
-10
No files found.
openair2/LAYER2/PDCP_v10.1.0/pdcp.c
View file @
103fc806
...
@@ -358,16 +358,7 @@ boolean_t pdcp_data_req(
...
@@ -358,16 +358,7 @@ boolean_t pdcp_data_req(
LOG_D
(
PDCP
,
"pdcp data req on drb %ld, size %d, rnti %x, node_type %d
\n
"
,
LOG_D
(
PDCP
,
"pdcp data req on drb %ld, size %d, rnti %x, node_type %d
\n
"
,
rb_idP
,
pdcp_pdu_size
,
ctxt_pP
->
rnti
,
RC
.
rrc
?
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
node_type
:
-
1
);
rb_idP
,
pdcp_pdu_size
,
ctxt_pP
->
rnti
,
RC
.
rrc
?
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
node_type
:
-
1
);
// The check on nos1 is done only for the use case of LTE stack running over 5g-nr PHY. This should be changed
if
(
ctxt_pP
->
enb_flag
==
ENB_FLAG_YES
&&
NODE_IS_DU
(
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
node_type
))
{
// before future merge of develop with develop-nr and instead of a check of IS_SOFTMODEM_NOS1, we should use a check
// with a new execution option capturing the nr-ip-over-LTE-stack use case.
ngran_node_t
node_type
;
if
(
IS_SOFTMODEM_NOS1
)
node_type
=
ngran_gNB
;
else
node_type
=
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
node_type
;
if
(
ctxt_pP
->
enb_flag
==
ENB_FLAG_YES
&&
NODE_IS_DU
(
node_type
))
{
//RC.rrc[ctxt_pP->module_id]->node_type
LOG_E
(
PDCP
,
"Can't be DU, bad node type %d
\n
"
,
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
node_type
);
LOG_E
(
PDCP
,
"Can't be DU, bad node type %d
\n
"
,
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
node_type
);
ret
=
FALSE
;
ret
=
FALSE
;
}
else
{
}
else
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment