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
f9d32a8f
Commit
f9d32a8f
authored
Dec 05, 2016
by
fnabet
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add workarounds for OAI issues
parent
ea3ccb35
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
36 additions
and
1 deletion
+36
-1
openair2/LAYER2/MAC/ue_procedures.c
openair2/LAYER2/MAC/ue_procedures.c
+36
-1
No files found.
openair2/LAYER2/MAC/ue_procedures.c
View file @
f9d32a8f
...
...
@@ -70,6 +70,8 @@
#define DEBUG_HEADER_PARSING 1
#define ENABLE_MAC_PAYLOAD_DEBUG 1
extern
uint8_t
usim_test
;
/*
#ifndef USER_MODE
#define msg debug_msg
...
...
@@ -1408,6 +1410,13 @@ for (lcid=DCCH; lcid < DTCH ; lcid++) {
//Adjust at the end of the loop
while
((
!
is_lcid_processed
)
&&
(
bsr_len
+
phr_len
+
total_rlc_pdu_header_len
+
sdu_length_total
+
MIN_MAC_HDR_RLC_SIZE
<=
buflen
))
{
// Workaround for issue in OAI eNB or EPC which are not able to process SRB2 message multiplexed with SRB1 on the same MAC PDU
if
((
usim_test
==
0
)
&&
(
lcid
==
DCCH1
)
&&
(
lcid_rlc_pdu_count
==
0
)
&&
(
num_sdus
))
{
// Skip SRB2 multiplex if at least one SRB1 SDU is already multiplexed
break
;
}
buflen_remain
=
buflen
-
(
bsr_len
+
phr_len
+
total_rlc_pdu_header_len
+
sdu_length_total
+
1
);
rlc_status
=
mac_rlc_status_ind
(
module_idP
,
...
...
@@ -1419,8 +1428,21 @@ for (lcid=DCCH; lcid < DTCH ; lcid++) {
lcid
,
buflen_remain
);
// Workaround for BO issue in RLC AM ReTx : RLC BO can not be bigger than stored MAC BO
if
(
UE_mac_inst
[
module_idP
].
scheduling_info
.
LCID_buffer_remain
[
lcid
]
<
rlc_status
.
bytes_in_buffer
)
{
LOG_I
(
MAC
,
"[UE %d] Frame %d Subframe%d: WARNING Inconsistent BO! for LCID=%d MAC=%d RLC=%d RLC PDU nb=%d
\n
"
,
module_idP
,
frameP
,
subframe
,
lcid
,
UE_mac_inst
[
module_idP
].
scheduling_info
.
LCID_buffer_remain
[
lcid
],
rlc_status
.
bytes_in_buffer
,
lcid_rlc_pdu_count
);
// Skip multiplexing for the LCID
break
;
}
/*
AssertFatal ( UE_mac_inst[module_idP].scheduling_info.LCID_buffer_remain[lcid] >= rlc_status.bytes_in_buffer, "Inconsistent BO! for LCID=%d MAC=%d RLC=%d RLC PDU nb=%d Frame %d Subrame %d\n",
lcid,UE_mac_inst[module_idP].scheduling_info.LCID_buffer_remain[lcid],rlc_status.bytes_in_buffer,lcid_rlc_pdu_count,frameP,subframe);
*/
if
(
rlc_status
.
bytes_in_buffer
>
0
)
{
...
...
@@ -1535,8 +1557,21 @@ if (UE_mac_inst[module_idP].scheduling_info.LCID_status[lcid] == LCID_NOT_EMPTY)
lcid
,
buflen_remain
);
AssertFatal
(
UE_mac_inst
[
module_idP
].
scheduling_info
.
LCID_buffer_remain
[
lcid
]
>=
rlc_status
.
bytes_in_buffer
,
"Inconsistent BO! for LCID=%d MAC=%d RLC=%d RLC PDU nb=%d Frame %d Subrame %d
\n
"
,
// Workaround for BO issue in RLC AM ReTx : RLC BO can not be bigger than stored MAC BO
if
(
UE_mac_inst
[
module_idP
].
scheduling_info
.
LCID_buffer_remain
[
lcid
]
<
rlc_status
.
bytes_in_buffer
)
{
LOG_I
(
MAC
,
"[UE %d] Frame %d Subframe%d: WARNING Inconsistent BO! for LCID=%d MAC=%d RLC=%d RLC PDU nb=%d
\n
"
,
module_idP
,
frameP
,
subframe
,
lcid
,
UE_mac_inst
[
module_idP
].
scheduling_info
.
LCID_buffer_remain
[
lcid
],
rlc_status
.
bytes_in_buffer
,
lcid_rlc_pdu_count
);
// Skip multiplexing for the LCID
break
;
}
/*
AssertFatal ( UE_mac_inst[module_idP].scheduling_info.LCID_buffer_remain[lcid] >= rlc_status.bytes_in_buffer, "Inconsistent BO! for LCID=%d MAC=%d RLC=%d RLC PDU nb=%d Frame %d Subrame %d\n",
lcid,UE_mac_inst[module_idP].scheduling_info.LCID_buffer_remain[lcid],rlc_status.bytes_in_buffer,lcid_rlc_pdu_count,frameP,subframe);
*/
if
(
rlc_status
.
bytes_in_buffer
>
0
)
{
...
...
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