Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
oai
openairinterface5G
Commits
bb4131b3
Commit
bb4131b3
authored
Mar 28, 2017
by
Bilel
Browse files
RLC AM add fixes
parent
3c7c61a4
Changes
3
Hide whitespace changes
Inline
Side-by-side
openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_retransmit.c
View file @
bb4131b3
...
...
@@ -1233,6 +1233,10 @@ mem_block_t * rlc_am_get_pdu_to_retransmit(
{
// TO DO : RLC Notification to RRC + ReEstablishment procedure
tx_data_pdu_management
->
flags
.
max_retransmit
=
1
;
LOG_W
(
RLC
,
PROTOCOL_RLC_AM_CTXT_FMT
"[RLC AM MAX RETX=%d] SN %04d
\n
"
,
PROTOCOL_RLC_AM_CTXT_ARGS
(
ctxt_pP
,
rlc_pP
),
tx_data_pdu_management
->
retx_count_next
,
sn
);
}
}
else
if
(
rlc_pP
->
nb_bytes_requested_by_mac
>=
5
)
...
...
@@ -1273,6 +1277,10 @@ mem_block_t * rlc_am_get_pdu_to_retransmit(
{
// TO DO : RLC Notification to RRC + ReEstablishment procedure
tx_data_pdu_management
->
flags
.
max_retransmit
=
1
;
LOG_W
(
RLC
,
PROTOCOL_RLC_AM_CTXT_FMT
"[RLC AM MAX RETX=%d] SN %04d
\n
"
,
PROTOCOL_RLC_AM_CTXT_ARGS
(
ctxt_pP
,
rlc_pP
),
tx_data_pdu_management
->
retx_count_next
,
sn
);
}
}
...
...
openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_rx_list.c
View file @
bb4131b3
...
...
@@ -261,7 +261,7 @@ mem_block_t * create_new_segment_from_pdu(
RLC_AM_PDU_SET_E
(
*
pdu_segment_header_p
);
}
/* SN */
(
*
pdu_segment_header_p
)
|=
(
pdu_new_segment_info_p
->
sn
>>
8
)
;
(
*
pdu_segment_header_p
)
|=
(
(
pdu_new_segment_info_p
->
sn
>>
8
)
&
0x3
)
;
*
(
pdu_segment_header_p
+
1
)
=
(
pdu_new_segment_info_p
->
sn
&
0xFF
);
pdu_segment_header_p
+=
2
;
...
...
@@ -272,7 +272,7 @@ mem_block_t * create_new_segment_from_pdu(
RLC_AM_PDU_SET_LSF
(
*
pdu_segment_header_p
);
}
/* Store SO bytes */
*
(
pdu_segment_header_p
)
=
(
pdu_new_segment_info_p
->
so
>>
8
)
&
0x
FF
;
*
(
pdu_segment_header_p
)
|
=
(
(
pdu_new_segment_info_p
->
so
>>
8
)
&
0x
7F
)
;
*
(
pdu_segment_header_p
+
1
)
=
pdu_new_segment_info_p
->
so
&
0xFF
;
if
(
num_li
)
{
...
...
openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_status_report.c
View file @
bb4131b3
...
...
@@ -378,7 +378,10 @@ rlc_am_receive_process_control_pdu(
break
;
}
}
sn_cursor
=
(
sn_cursor
+
1
)
&
RLC_AM_SN_MASK
;
if
(
prev_nack_sn
!=
nack_sn
)
{
/* do not increment sn_cursor in case of several informations for the same nack_sn */
sn_cursor
=
(
sn_cursor
+
1
)
&
RLC_AM_SN_MASK
;
}
}
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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