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
promise
OpenXG-RAN
Commits
40fa3e07
Commit
40fa3e07
authored
Mar 15, 2017
by
gabrielC
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
RLC AM Rx fixes
parent
18f62884
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
5 deletions
+15
-5
openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_rx_list.c
openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_rx_list.c
+9
-3
openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_status_report.c
openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_status_report.c
+6
-2
No files found.
openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_rx_list.c
View file @
40fa3e07
...
...
@@ -490,7 +490,7 @@ rlc_am_rx_pdu_status_t rlc_am_rx_list_handle_pdu_segment(
mem_block_t
*
trunc_segment
=
create_new_segment_from_pdu
(
tb_pP
,
so_start_segment
-
pdu_rx_info_p
->
so
,
so_end_segment
-
so_start_segment
+
1
);
if
(
trunc_segment
!=
NULL
)
{
LOG_
D
(
RLC
,
PROTOCOL_RLC_AM_CTXT_FMT
"[PROCESS RX PDU SEGMENT] CREATE SEGMENT FROM SEGMENT OFFSET=%d DATA LENGTH=%d SN=%d
\n
"
,
LOG_
I
(
RLC
,
PROTOCOL_RLC_AM_CTXT_FMT
"[PROCESS RX PDU SEGMENT] CREATE SEGMENT FROM SEGMENT OFFSET=%d DATA LENGTH=%d SN=%d
\n
"
,
PROTOCOL_RLC_AM_CTXT_ARGS
(
ctxt_pP
,
rlc_pP
),
so_start_segment
-
pdu_rx_info_p
->
so
,
so_end_segment
-
so_start_segment
+
1
,
pdu_rx_info_p
->
sn
);
if
(
previous_cursor_p
!=
NULL
)
{
...
...
@@ -610,7 +610,13 @@ rlc_am_rx_pdu_status_t rlc_am_rx_list_handle_pdu(
LOG_D
(
RLC
,
PROTOCOL_RLC_AM_CTXT_FMT
"[PROCESS RX PDU] PDU REPLACES STORED PDU SEGMENTS SN=%d
\n
"
,
PROTOCOL_RLC_AM_CTXT_ARGS
(
ctxt_pP
,
rlc_pP
),
pdu_rx_info_p
->
sn
);
list2_insert_after_element
(
tb_pP
,
previous_cursor_p
,
&
rlc_pP
->
receiver_buffer
);
if
(
previous_cursor_p
!=
NULL
)
{
list2_insert_after_element
(
tb_pP
,
previous_cursor_p
,
&
rlc_pP
->
receiver_buffer
);
}
else
{
list2_insert_before_element
(
tb_pP
,
cursor_next_p
,
&
rlc_pP
->
receiver_buffer
);
}
return
pdu_status
;
}
// End SN != vrR or SO != 0
else
{
...
...
@@ -636,7 +642,7 @@ rlc_am_rx_pdu_status_t rlc_am_rx_list_handle_pdu(
/* Insert PDU Segment */
list2_insert_after_element
(
trunc_pdu
,
previous_cursor_p
,
&
rlc_pP
->
receiver_buffer
);
LOG_
D
(
RLC
,
PROTOCOL_RLC_AM_CTXT_FMT
"[PROCESS RX PDU] CREATE PDU SEGMENT FROM PDU OFFSET =%d SN=%d
\n
"
,
LOG_
I
(
RLC
,
PROTOCOL_RLC_AM_CTXT_FMT
"[PROCESS RX PDU] CREATE PDU SEGMENT FROM PDU OFFSET =%d SN=%d
\n
"
,
PROTOCOL_RLC_AM_CTXT_ARGS
(
ctxt_pP
,
rlc_pP
),
next_waited_so
,
pdu_rx_info_p
->
sn
);
/* clean previous stored segments in duplicate */
...
...
openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_status_report.c
View file @
40fa3e07
...
...
@@ -736,8 +736,12 @@ rlc_am_send_status_pdu(
}
// End main while NACK_SN
/* Clear E1 of last nack_sn entry */
AssertFatal
((
control_pdu_info
.
num_nack
)
||
(
all_segments_received
==
0
),
"RLC AM Tx Status PDU Data Error no NACK_SN LcId=%d
\n
"
,
rlc_pP
->
channel_id
);
control_pdu_info
.
nack_list
[
control_pdu_info
.
num_nack
-
1
].
e1
=
0
;
AssertFatal
((
control_pdu_info
.
num_nack
)
||
(
all_segments_received
==
0
),
"RLC AM Tx Status PDU Data Error no NACK_SN vrR=%d vrMS=%d lastSN_NACK=%d Completed=%d NbBytesAvailable=%d LcId=%d
\n
"
,
rlc_pP
->
vr_r
,
rlc_pP
->
vr_ms
,
sn_nack
,
status_report_completed
,(
nb_bits_to_transmit
>>
3
),
rlc_pP
->
channel_id
);
if
(
control_pdu_info
.
num_nack
)
{
control_pdu_info
.
nack_list
[
control_pdu_info
.
num_nack
-
1
].
e1
=
0
;
}
/* Set ACK_SN unless it was set before */
if
(
!
status_report_completed
){
...
...
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