mbuf: replace data pointer by an offset

[dpdk.git] / lib / librte_mbuf / rte_mbuf.c

diff --git a/lib/librte_mbuf/rte_mbuf.c b/lib/librte_mbuf/rte_mbuf.c
index d12a0bf..26e36eb 100644 (file)
--- a/lib/librte_mbuf/rte_mbuf.c
+++ b/lib/librte_mbuf/rte_mbuf.c
@@ -117,12 +117,12 @@ rte_pktmbuf_init(struct rte_mempool *mp,
        m->buf_len = (uint16_t)buf_len;
 
        /* keep some headroom between start of buffer and data */
-       m->data = (char*) m->buf_addr + RTE_MIN(RTE_PKTMBUF_HEADROOM, m->buf_len);
+       m->data_off = RTE_MIN(RTE_PKTMBUF_HEADROOM, (uint16_t)m->buf_len);
 
        /* init some constant fields */
        m->pool = mp;
        m->nb_segs = 1;
-       m->in_port = 0xff;
+       m->port = 0xff;
 }
 
 /* do some sanity checks on a mbuf: panic if it fails */
@@ -176,19 +176,19 @@ rte_pktmbuf_dump(FILE *f, const struct rte_mbuf *m, unsigned dump_len)
               m, (uint64_t)m->buf_physaddr, (unsigned)m->buf_len);
        fprintf(f, "  pkt_len=%"PRIu32", ol_flags=%"PRIx16", nb_segs=%u, "
               "in_port=%u\n", m->pkt_len, m->ol_flags,
-              (unsigned)m->nb_segs, (unsigned)m->in_port);
+              (unsigned)m->nb_segs, (unsigned)m->port);
        nb_segs = m->nb_segs;
 
        while (m && nb_segs != 0) {
                __rte_mbuf_sanity_check(m, 0);
 
                fprintf(f, "  segment at 0x%p, data=0x%p, data_len=%u\n",
-                      m, m->data, (unsigned)m->data_len);
+                       m, rte_pktmbuf_mtod(m, void *), (unsigned)m->data_len);
                len = dump_len;
                if (len > m->data_len)
                        len = m->data_len;
                if (len != 0)
-                       rte_hexdump(f, NULL, m->data, len);
+                       rte_hexdump(f, NULL, rte_pktmbuf_mtod(m, void *), len);
                dump_len -= len;
                m = m->next;
                nb_segs --;