PentHertz
/
srsLTE
mirror of https://github.com/PentHertz/srsLTE.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'restruct_update' of github.com:softwareradiosystems/srsLTE into restruct_update

This commit is contained in:
Ismael Gomez 2017-06-02 12:35:48 +02:00
parent a4498aeb1e 843e2c2546
commit a9e0fdfba5
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/src/upper/rlc_am.cc
View File

@ -256,12 +256,14 @@ uint32_t rlc_am::get_buffer_state()
}
// Bytes needed for tx SDUs
n_sdus = tx_sdu_queue.size();
n_bytes = tx_sdu_queue.size_bytes();
if(tx_sdu)
{
n_sdus++;
n_bytes += tx_sdu->N_bytes;
if(tx_window.size() < RLC_AM_WINDOW_SIZE) {
n_sdus = tx_sdu_queue.size();
n_bytes = tx_sdu_queue.size_bytes();
if(tx_sdu)
{
n_sdus++;
n_bytes += tx_sdu->N_bytes;
}
}
// Room needed for header extensions? (integer rounding)
@ -676,8 +678,11 @@ int rlc_am::build_data_pdu(uint8_t *payload, uint32_t nof_bytes)
// Set Poll bit
pdu_without_poll++;
byte_without_poll += (pdu->N_bytes + head_len);
log->debug("%s pdu_without_poll: %d\n", rb_id_text[lcid], pdu_without_poll);
log->debug("%s byte_without_poll: %d\n", rb_id_text[lcid], byte_without_poll);
if(poll_required())
{
log->debug("%s setting poll bit to request status\n", rb_id_text[lcid]);
header.p = 1;
poll_sn = vt_s;
pdu_without_poll = 0;