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

Resolved conflicting commits d66a455479 and c850e2f87a

This commit is contained in:
Ismael Gomez 2018-03-15 10:56:18 +01:00
parent 25ccd29646
commit 599cf9bc07
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/src/common/pdu.cc
View File

@ -123,8 +123,8 @@ uint8_t* sch_pdu::write_packet(srslte::log *log_h)
padding.set_padding();
if (nof_subheaders <= 0) {
log_h->error("Writting PDU: nof_subheaders=%d\n", nof_subheaders);
log_h->console("Writting PDU: nof_subheaders=%d\n", nof_subheaders);
log_h->error("Trying to write packet with invalid number of subheaders (nof_subheaders=%d).\n", nof_subheaders);
log_h->console("Trying to write packet with invalid number of subheaders (nof_subheaders=%d).\n", nof_subheaders);
return NULL;
}
@ -133,11 +133,6 @@ uint8_t* sch_pdu::write_packet(srslte::log *log_h)
return NULL;
}
if (nof_subheaders <= 0) {
log_h->error("Trying to write packet with invalid number of subheaders (nof_subheaders=%d).\n", nof_subheaders);
return NULL;
}
/* If last SDU has zero payload, remove it. FIXME: Why happens this?? */
if (subheaders[nof_subheaders-1].get_payload_size() == 0) {
del_subh();