Merge commit '00096acb8fbbf76b4fd8a223a2684df6c370d9f9'

[osmocom-bb.git] / src / shared / libosmocore / src / msgb.c

diff --git a/src/shared/libosmocore/src/msgb.c b/src/shared/libosmocore/src/msgb.c
index 2521ca8..60af373 100644 (file)
--- a/src/shared/libosmocore/src/msgb.c
+++ b/src/shared/libosmocore/src/msgb.c
@@ -44,12 +44,8 @@ struct msgb *msgb_alloc(uint16_t size, const char *name)
        msg->data_len = size;
        msg->len = 0;
        msg->data = msg->_data;
-
-       msg->head = msg->data;
-       msg->data = msg->data;
-       /* reset tail pointer */
-       msg->tail = msg->data;
-       //msg->end = msg->tail + size;
+       msg->head = msg->_data;
+       msg->tail = msg->_data;
 
        return msg;
 }
@@ -79,16 +75,11 @@ struct msgb *msgb_dequeue(struct llist_head *queue)
 
 void msgb_reset(struct msgb *msg)
 {
-       msg->len = 0;
        msg->len = 0;
        msg->data = msg->_data;
+       msg->head = msg->_data;
+       msg->tail = msg->_data;
 
-       msg->head = msg->data;
-       msg->data = msg->data;
-       /* reset tail pointer */
-       msg->tail = msg->data;
-
-       /* reset pointers */
        msg->bts_link = NULL;
        msg->trx = NULL;
        msg->lchan = NULL;