remove unused ring includes

[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 8cf5436..80b1713 100644 (file)
--- a/lib/librte_mbuf/rte_mbuf.c
+++ b/lib/librte_mbuf/rte_mbuf.c
@@ -53,7 +53,6 @@
 #include <rte_lcore.h>
 #include <rte_atomic.h>
 #include <rte_branch_prediction.h>
-#include <rte_ring.h>
 #include <rte_mempool.h>
 #include <rte_mbuf.h>
 #include <rte_string_fns.h>
@@ -156,6 +155,7 @@ rte_pktmbuf_pool_create(const char *name, unsigned n,
        struct rte_mempool *mp;
        struct rte_pktmbuf_pool_private mbp_priv;
        unsigned elt_size;
+       int ret;
 
        if (RTE_ALIGN(priv_size, RTE_MBUF_PRIV_ALIGN) != priv_size) {
                RTE_LOG(ERR, MBUF, "mbuf priv_size=%u is not aligned\n",
@@ -181,8 +181,10 @@ rte_pktmbuf_pool_create(const char *name, unsigned n,
        }
        rte_pktmbuf_pool_init(mp, &mbp_priv);
 
-       if (rte_mempool_populate_default(mp) < 0) {
+       ret = rte_mempool_populate_default(mp);
+       if (ret < 0) {
                rte_mempool_free(mp);
+               rte_errno = -ret;
                return NULL;
        }
 
@@ -236,7 +238,7 @@ rte_pktmbuf_dump(FILE *f, const struct rte_mbuf *m, unsigned dump_len)
 
        __rte_mbuf_sanity_check(m, 1);
 
-       fprintf(f, "dump mbuf at 0x%p, phys=%"PRIx64", buf_len=%u\n",
+       fprintf(f, "dump mbuf at %p, phys=%"PRIx64", buf_len=%u\n",
               m, (uint64_t)m->buf_physaddr, (unsigned)m->buf_len);
        fprintf(f, "  pkt_len=%"PRIu32", ol_flags=%"PRIx64", nb_segs=%u, "
               "in_port=%u\n", m->pkt_len, m->ol_flags,
@@ -246,7 +248,7 @@ rte_pktmbuf_dump(FILE *f, const struct rte_mbuf *m, unsigned dump_len)
        while (m && nb_segs != 0) {
                __rte_mbuf_sanity_check(m, 0);
 
-               fprintf(f, "  segment at 0x%p, data=0x%p, data_len=%u\n",
+               fprintf(f, "  segment at %p, data=%p, data_len=%u\n",
                        m, rte_pktmbuf_mtod(m, void *), (unsigned)m->data_len);
                len = dump_len;
                if (len > m->data_len)
@@ -272,10 +274,6 @@ const char *rte_get_rx_ol_flag_name(uint64_t mask)
        case PKT_RX_L4_CKSUM_BAD: return "PKT_RX_L4_CKSUM_BAD";
        case PKT_RX_IP_CKSUM_BAD: return "PKT_RX_IP_CKSUM_BAD";
        case PKT_RX_EIP_CKSUM_BAD: return "PKT_RX_EIP_CKSUM_BAD";
-       /* case PKT_RX_OVERSIZE: return "PKT_RX_OVERSIZE"; */
-       /* case PKT_RX_HBUF_OVERFLOW: return "PKT_RX_HBUF_OVERFLOW"; */
-       /* case PKT_RX_RECIP_ERR: return "PKT_RX_RECIP_ERR"; */
-       /* case PKT_RX_MAC_ERR: return "PKT_RX_MAC_ERR"; */
        case PKT_RX_VLAN_STRIPPED: return "PKT_RX_VLAN_STRIPPED";
        case PKT_RX_IEEE1588_PTP: return "PKT_RX_IEEE1588_PTP";
        case PKT_RX_IEEE1588_TMST: return "PKT_RX_IEEE1588_TMST";