Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG UE
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
Michael Black
OpenXG UE
Commits
cc2caa90
Commit
cc2caa90
authored
Sep 24, 2018
by
Navid Nikaein
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix F1-U srb and drb function calls (not tested).
parent
5cf4dcd1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
47 additions
and
12 deletions
+47
-12
openair2/LAYER2/PDCP_v10.1.0/pdcp.c
openair2/LAYER2/PDCP_v10.1.0/pdcp.c
+33
-1
openair2/LAYER2/RLC/rlc.c
openair2/LAYER2/RLC/rlc.c
+14
-11
No files found.
openair2/LAYER2/PDCP_v10.1.0/pdcp.c
View file @
cc2caa90
...
...
@@ -395,7 +395,13 @@ boolean_t pdcp_data_req(
confirmP
,
pdcp_pdu_size
,
pdcp_pdu_p
);
/* assume good status */
rlc_status
=
RLC_OP_STATUS_OK
;
}
else
{
ret
=
TRUE
;
}
else
if
(
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
node_type
==
ngran_eNB_DU
||
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
node_type
==
ngran_gNB_DU
){
LOG_E
(
PDCP
,
"Can't be DU, bad node type %d
\n
"
,
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
node_type
);
ret
=
FALSE
;
}
else
{
rlc_status
=
rlc_data_req
(
ctxt_pP
,
srb_flagP
,
MBMS_FLAG_NO
,
rb_idP
,
muiP
,
confirmP
,
pdcp_pdu_size
,
pdcp_pdu_p
...
...
@@ -404,6 +410,32 @@ boolean_t pdcp_data_req(
,
destinationL2Id
#endif
);
switch
(
rlc_status
)
{
case
RLC_OP_STATUS_OK
:
LOG_D
(
PDCP
,
"Data sending request over RLC succeeded!
\n
"
);
ret
=
TRUE
;
break
;
case
RLC_OP_STATUS_BAD_PARAMETER
:
LOG_W
(
PDCP
,
"Data sending request over RLC failed with 'Bad Parameter' reason!
\n
"
);
ret
=
FALSE
;
break
;
case
RLC_OP_STATUS_INTERNAL_ERROR
:
LOG_W
(
PDCP
,
"Data sending request over RLC failed with 'Internal Error' reason!
\n
"
);
ret
=
FALSE
;
break
;
case
RLC_OP_STATUS_OUT_OF_RESSOURCES
:
LOG_W
(
PDCP
,
"Data sending request over RLC failed with 'Out of Resources' reason!
\n
"
);
ret
=
FALSE
;
break
;
default:
LOG_W
(
PDCP
,
"RLC returned an unknown status code after PDCP placed the order to send some data (Status Code:%d)
\n
"
,
rlc_status
);
ret
=
FALSE
;
break
;
}
// switch case
}
/* end if node_type is CU */
free_mem_block
(
pdcp_pdu_p
,
__FUNCTION__
);
...
...
openair2/LAYER2/RLC/rlc.c
View file @
cc2caa90
...
...
@@ -625,22 +625,25 @@ void rlc_data_ind (
case
ngran_eNB_CU
:
case
ngran_ng_eNB_CU
:
case
ngran_gNB_CU
:
proto_agent_send_pdcp_data_ind
(
ctxt_pP
,
1
,
// srb_flagP,
0
,
// MBMS_flagP,
rb_idP
,
sdu_sizeP
,
sdu_pP
);
break
;
LOG_E
(
RLC
,
"Can't be CU, Bad Node type %d
\n
"
,
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
node_type
);
break
;
case
ngran_eNB_DU
:
case
ngran_gNB_DU
:
if
(
srb_flagP
==
1
)
DU_send_UL_RRC_MESSAGE_TRANSFER
(
ctxt_pP
,
rb_idP
,
sdu_sizeP
,
sdu_pP
->
data
);
break
;
sdu_sizeP
,
sdu_pP
->
data
);
else
proto_agent_send_pdcp_data_ind
(
ctxt_pP
,
srb_flagP
,
MBMS_flagP
,
rb_idP
,
sdu_sizeP
,
sdu_pP
);
break
;
default:
pdcp_data_ind
(
...
...
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