mbuf: add accessors for data room and private size

[dpdk.git] / lib / librte_pmd_af_packet / rte_eth_af_packet.c

diff --git a/lib/librte_pmd_af_packet/rte_eth_af_packet.c b/lib/librte_pmd_af_packet/rte_eth_af_packet.c
index 2ac50ba..bdd9628 100644 (file)
--- a/lib/librte_pmd_af_packet/rte_eth_af_packet.c
+++ b/lib/librte_pmd_af_packet/rte_eth_af_packet.c
@@ -348,15 +348,13 @@ eth_rx_queue_setup(struct rte_eth_dev *dev,
 {
        struct pmd_internals *internals = dev->data->dev_private;
        struct pkt_rx_queue *pkt_q = &internals->rx_queue[rx_queue_id];
-       struct rte_pktmbuf_pool_private *mbp_priv;
        uint16_t buf_size;
 
        pkt_q->mb_pool = mb_pool;
 
        /* Now get the space available for data in the mbuf */
-       mbp_priv = rte_mempool_get_priv(pkt_q->mb_pool);
-       buf_size = (uint16_t) (mbp_priv->mbuf_data_room_size -
-                              RTE_PKTMBUF_HEADROOM);
+       buf_size = (uint16_t)(rte_pktmbuf_data_room_size(pkt_q->mb_pool) -
+               RTE_PKTMBUF_HEADROOM);
 
        if (ETH_FRAME_LEN > buf_size) {
                RTE_LOG(ERR, PMD,
@@ -384,7 +382,7 @@ eth_tx_queue_setup(struct rte_eth_dev *dev,
        return 0;
 }
 
-static struct eth_dev_ops ops = {
+static const struct eth_dev_ops ops = {
        .dev_start = eth_dev_start,
        .dev_stop = eth_dev_stop,
        .dev_close = eth_dev_close,
@@ -680,18 +678,16 @@ rte_pmd_init_internals(const char *name,
        return 0;
 
 error:
-       if (data)
-               rte_free(data);
-       if (pci_dev)
-               rte_free(pci_dev);
+       rte_free(data);
+       rte_free(pci_dev);
+
        if (*internals) {
                for (q = 0; q < nb_queues; q++) {
                        munmap((*internals)->rx_queue[q].map,
                               2 * req->tp_block_size * req->tp_block_nr);
-                       if ((*internals)->rx_queue[q].rd)
-                               rte_free((*internals)->rx_queue[q].rd);
-                       if ((*internals)->tx_queue[q].rd)
-                               rte_free((*internals)->tx_queue[q].rd);
+
+                       rte_free((*internals)->rx_queue[q].rd);
+                       rte_free((*internals)->tx_queue[q].rd);
                        if (((*internals)->rx_queue[q].sockfd != 0) &&
                                ((*internals)->rx_queue[q].sockfd != qsockfd))
                                close((*internals)->rx_queue[q].sockfd);