From 599cf9bc076ade9012602880df7e24a782beb64d Mon Sep 17 00:00:00 2001 From: Ismael Gomez Date: Thu, 15 Mar 2018 10:56:18 +0100 Subject: [PATCH] Resolved conflicting commits d66a455479bafe46141e4de4618a0dda65d6c621 and c850e2f87adab470c0692e5781b22a0a43d3a92b --- lib/src/common/pdu.cc | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/lib/src/common/pdu.cc b/lib/src/common/pdu.cc index b020cde81..b0cdef638 100644 --- a/lib/src/common/pdu.cc +++ b/lib/src/common/pdu.cc @@ -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();