mbuf: add accessors for data room and private size
[dpdk.git] / lib / librte_ether / rte_ethdev.c
index f70fc75..024fe8b 100644 (file)
@@ -52,7 +52,6 @@
 #include <rte_memcpy.h>
 #include <rte_memzone.h>
 #include <rte_launch.h>
-#include <rte_tailq.h>
 #include <rte_eal.h>
 #include <rte_per_lcore.h>
 #include <rte_lcore.h>
@@ -120,34 +119,34 @@ struct rte_eth_xstats_name_off {
        unsigned offset;
 };
 
-static struct rte_eth_xstats_name_off rte_stats_strings[] = {
-        {"rx_packets", offsetof(struct rte_eth_stats, ipackets)},
-        {"tx_packets", offsetof(struct rte_eth_stats, opackets)},
-        {"rx_bytes", offsetof(struct rte_eth_stats, ibytes)},
-        {"tx_bytes", offsetof(struct rte_eth_stats, obytes)},
-        {"tx_errors", offsetof(struct rte_eth_stats, oerrors)},
-        {"rx_missed_errors", offsetof(struct rte_eth_stats, imissed)},
-        {"rx_crc_errors", offsetof(struct rte_eth_stats, ibadcrc)},
-        {"rx_bad_length_errors", offsetof(struct rte_eth_stats, ibadlen)},
-        {"rx_errors", offsetof(struct rte_eth_stats, ierrors)},
-        {"alloc_rx_buff_failed", offsetof(struct rte_eth_stats, rx_nombuf)},
-        {"fdir_match", offsetof(struct rte_eth_stats, fdirmatch)},
-        {"fdir_miss", offsetof(struct rte_eth_stats, fdirmiss)},
-        {"tx_flow_control_xon", offsetof(struct rte_eth_stats, tx_pause_xon)},
-        {"rx_flow_control_xon", offsetof(struct rte_eth_stats, rx_pause_xon)},
-        {"tx_flow_control_xoff", offsetof(struct rte_eth_stats, tx_pause_xoff)},
-        {"rx_flow_control_xoff", offsetof(struct rte_eth_stats, rx_pause_xoff)},
+static const struct rte_eth_xstats_name_off rte_stats_strings[] = {
+       {"rx_packets", offsetof(struct rte_eth_stats, ipackets)},
+       {"tx_packets", offsetof(struct rte_eth_stats, opackets)},
+       {"rx_bytes", offsetof(struct rte_eth_stats, ibytes)},
+       {"tx_bytes", offsetof(struct rte_eth_stats, obytes)},
+       {"tx_errors", offsetof(struct rte_eth_stats, oerrors)},
+       {"rx_missed_errors", offsetof(struct rte_eth_stats, imissed)},
+       {"rx_crc_errors", offsetof(struct rte_eth_stats, ibadcrc)},
+       {"rx_bad_length_errors", offsetof(struct rte_eth_stats, ibadlen)},
+       {"rx_errors", offsetof(struct rte_eth_stats, ierrors)},
+       {"alloc_rx_buff_failed", offsetof(struct rte_eth_stats, rx_nombuf)},
+       {"fdir_match", offsetof(struct rte_eth_stats, fdirmatch)},
+       {"fdir_miss", offsetof(struct rte_eth_stats, fdirmiss)},
+       {"tx_flow_control_xon", offsetof(struct rte_eth_stats, tx_pause_xon)},
+       {"rx_flow_control_xon", offsetof(struct rte_eth_stats, rx_pause_xon)},
+       {"tx_flow_control_xoff", offsetof(struct rte_eth_stats, tx_pause_xoff)},
+       {"rx_flow_control_xoff", offsetof(struct rte_eth_stats, rx_pause_xoff)},
 };
 #define RTE_NB_STATS (sizeof(rte_stats_strings) / sizeof(rte_stats_strings[0]))
 
-static struct rte_eth_xstats_name_off rte_rxq_stats_strings[] = {
+static const struct rte_eth_xstats_name_off rte_rxq_stats_strings[] = {
        {"rx_packets", offsetof(struct rte_eth_stats, q_ipackets)},
        {"rx_bytes", offsetof(struct rte_eth_stats, q_ibytes)},
 };
 #define RTE_NB_RXQ_STATS (sizeof(rte_rxq_stats_strings) /      \
                sizeof(rte_rxq_stats_strings[0]))
 
-static struct rte_eth_xstats_name_off rte_txq_stats_strings[] = {
+static const struct rte_eth_xstats_name_off rte_txq_stats_strings[] = {
        {"tx_packets", offsetof(struct rte_eth_stats, q_opackets)},
        {"tx_bytes", offsetof(struct rte_eth_stats, q_obytes)},
        {"tx_errors", offsetof(struct rte_eth_stats, q_errors)},
@@ -180,7 +179,7 @@ enum {
        DEV_ATTACHED
 };
 
-static inline void
+static void
 rte_eth_dev_data_alloc(void)
 {
        const unsigned flags = 0;
@@ -256,7 +255,7 @@ rte_eth_dev_allocate(const char *name, enum rte_eth_dev_type type)
        return eth_dev;
 }
 
-static inline int
+static int
 rte_eth_dev_create_unique_device_name(char *name, size_t size,
                struct rte_pci_device *pci_dev)
 {
@@ -324,9 +323,9 @@ rte_eth_dev_init(struct rte_pci_driver *pci_drv,
        eth_dev->data->mtu = ETHER_MTU;
 
        /* Invoke PMD device initialization function */
-       diag = (*eth_drv->eth_dev_init)(eth_drv, eth_dev);
+       diag = (*eth_drv->eth_dev_init)(eth_dev);
        if (diag == 0)
-               return (0);
+               return 0;
 
        PMD_DEBUG_TRACE("driver %s: eth_dev_init(vendor_id=0x%u device_id=0x%x)"
                        " failed\n", pci_drv->name,
@@ -362,7 +361,7 @@ rte_eth_dev_uninit(struct rte_pci_device *pci_dev)
 
        /* Invoke PMD device uninit function */
        if (*eth_drv->eth_dev_uninit) {
-               ret = (*eth_drv->eth_dev_uninit)(eth_drv, eth_dev);
+               ret = (*eth_drv->eth_dev_uninit)(eth_dev);
                if (ret)
                        return ret;
        }
@@ -423,7 +422,7 @@ rte_eth_dev_socket_id(uint8_t port_id)
 uint8_t
 rte_eth_dev_count(void)
 {
-       return (nb_ports);
+       return nb_ports;
 }
 
 /* So far, DPDK hotplug function only supports linux */
@@ -513,11 +512,11 @@ rte_eth_dev_is_detachable(uint8_t port_id)
        }
 
        if (rte_eth_devices[port_id].dev_type == RTE_ETH_DEV_PCI) {
-               switch (rte_eth_devices[port_id].pci_dev->pt_driver) {
-               case RTE_PT_IGB_UIO:
-               case RTE_PT_UIO_GENERIC:
+               switch (rte_eth_devices[port_id].pci_dev->kdrv) {
+               case RTE_KDRV_IGB_UIO:
+               case RTE_KDRV_UIO_GENERIC:
                        break;
-               case RTE_PT_VFIO:
+               case RTE_KDRV_VFIO:
                default:
                        return -ENOTSUP;
                }
@@ -742,19 +741,6 @@ rte_eth_dev_rx_queue_config(struct rte_eth_dev *dev, uint16_t nb_queues)
                        dev->data->nb_rx_queues = 0;
                        return -(ENOMEM);
                }
-#ifdef RTE_ETHDEV_RXTX_CALLBACKS
-               dev->post_rx_burst_cbs = rte_zmalloc(
-                       "ethdev->post_rx_burst_cbs",
-                       sizeof(*dev->post_rx_burst_cbs) * nb_queues,
-                       RTE_CACHE_LINE_SIZE);
-               if (dev->post_rx_burst_cbs == NULL) {
-                       rte_free(dev->data->rx_queues);
-                       dev->data->rx_queues = NULL;
-                       dev->data->nb_rx_queues = 0;
-                       return -ENOMEM;
-               }
-#endif
-
        } else { /* re-configure */
                FUNC_PTR_OR_ERR_RET(*dev->dev_ops->rx_queue_release, -ENOTSUP);
 
@@ -766,29 +752,17 @@ rte_eth_dev_rx_queue_config(struct rte_eth_dev *dev, uint16_t nb_queues)
                                RTE_CACHE_LINE_SIZE);
                if (rxq == NULL)
                        return -(ENOMEM);
-#ifdef RTE_ETHDEV_RXTX_CALLBACKS
-               dev->post_rx_burst_cbs = rte_realloc(
-                       dev->post_rx_burst_cbs,
-                       sizeof(*dev->post_rx_burst_cbs) *
-                               nb_queues, RTE_CACHE_LINE_SIZE);
-               if (dev->post_rx_burst_cbs == NULL)
-                       return -ENOMEM;
-#endif
                if (nb_queues > old_nb_queues) {
                        uint16_t new_qs = nb_queues - old_nb_queues;
                        memset(rxq + old_nb_queues, 0,
                                sizeof(rxq[0]) * new_qs);
-#ifdef RTE_ETHDEV_RXTX_CALLBACKS
-                       memset(dev->post_rx_burst_cbs + old_nb_queues, 0,
-                               sizeof(dev->post_rx_burst_cbs[0]) * new_qs);
-#endif
                }
 
                dev->data->rx_queues = rxq;
 
        }
        dev->data->nb_rx_queues = nb_queues;
-       return (0);
+       return 0;
 }
 
 int
@@ -910,19 +884,6 @@ rte_eth_dev_tx_queue_config(struct rte_eth_dev *dev, uint16_t nb_queues)
                        dev->data->nb_tx_queues = 0;
                        return -(ENOMEM);
                }
-#ifdef RTE_ETHDEV_RXTX_CALLBACKS
-               dev->pre_tx_burst_cbs = rte_zmalloc(
-                       "ethdev->pre_tx_burst_cbs",
-                       sizeof(*dev->pre_tx_burst_cbs) * nb_queues,
-                       RTE_CACHE_LINE_SIZE);
-               if (dev->pre_tx_burst_cbs == NULL) {
-                       rte_free(dev->data->tx_queues);
-                       dev->data->tx_queues = NULL;
-                       dev->data->nb_tx_queues = 0;
-                       return -ENOMEM;
-               }
-#endif
-
        } else { /* re-configure */
                FUNC_PTR_OR_ERR_RET(*dev->dev_ops->tx_queue_release, -ENOTSUP);
 
@@ -934,29 +895,17 @@ rte_eth_dev_tx_queue_config(struct rte_eth_dev *dev, uint16_t nb_queues)
                                RTE_CACHE_LINE_SIZE);
                if (txq == NULL)
                        return -ENOMEM;
-#ifdef RTE_ETHDEV_RXTX_CALLBACKS
-               dev->pre_tx_burst_cbs = rte_realloc(
-                       dev->pre_tx_burst_cbs,
-                       sizeof(*dev->pre_tx_burst_cbs) *
-                               nb_queues, RTE_CACHE_LINE_SIZE);
-               if (dev->pre_tx_burst_cbs == NULL)
-                       return -ENOMEM;
-#endif
                if (nb_queues > old_nb_queues) {
                        uint16_t new_qs = nb_queues - old_nb_queues;
                        memset(txq + old_nb_queues, 0,
                                sizeof(txq[0]) * new_qs);
-#ifdef RTE_ETHDEV_RXTX_CALLBACKS
-                       memset(dev->pre_tx_burst_cbs + old_nb_queues, 0,
-                               sizeof(dev->pre_tx_burst_cbs[0]) * new_qs);
-#endif
                }
 
                dev->data->tx_queues = txq;
 
        }
        dev->data->nb_tx_queues = nb_queues;
-       return (0);
+       return 0;
 }
 
 static int
@@ -1002,7 +951,7 @@ rte_eth_dev_check_mq_mode(uint8_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q,
                                        port_id,
                                        dev_conf->rxmode.mq_mode,
                                        dev_conf->txmode.mq_mode);
-                       return (-EINVAL);
+                       return -EINVAL;
                }
 
                switch (dev_conf->rxmode.mq_mode) {
@@ -1013,7 +962,7 @@ rte_eth_dev_check_mq_mode(uint8_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q,
                                        " SRIOV active, "
                                        "unsupported VMDQ mq_mode rx %u\n",
                                        port_id, dev_conf->rxmode.mq_mode);
-                       return (-EINVAL);
+                       return -EINVAL;
                case ETH_MQ_RX_RSS:
                        PMD_DEBUG_TRACE("ethdev port_id=%" PRIu8
                                        " SRIOV active, "
@@ -1049,7 +998,7 @@ rte_eth_dev_check_mq_mode(uint8_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q,
                                        " SRIOV active, "
                                        "unsupported VMDQ mq_mode tx %u\n",
                                        port_id, dev_conf->txmode.mq_mode);
-                       return (-EINVAL);
+                       return -EINVAL;
                default: /* ETH_MQ_TX_VMDQ_ONLY or ETH_MQ_TX_NONE */
                        /* if nothing mq mode configure, use default scheme */
                        dev->data->dev_conf.txmode.mq_mode = ETH_MQ_TX_VMDQ_ONLY;
@@ -1062,7 +1011,7 @@ rte_eth_dev_check_mq_mode(uint8_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q,
                        PMD_DEBUG_TRACE("ethdev port_id=%d SRIOV active, "
                                    "queue number must less equal to %d\n",
                                        port_id, RTE_ETH_DEV_SRIOV(dev).nb_q_per_pool);
-                       return (-EINVAL);
+                       return -EINVAL;
                }
        } else {
                /* For vmdb+dcb mode check our configuration before we go further */
@@ -1073,7 +1022,7 @@ rte_eth_dev_check_mq_mode(uint8_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q,
                                PMD_DEBUG_TRACE("ethdev port_id=%d VMDQ+DCB, nb_rx_q "
                                                "!= %d\n",
                                                port_id, ETH_VMDQ_DCB_NUM_QUEUES);
-                               return (-EINVAL);
+                               return -EINVAL;
                        }
                        conf = &(dev_conf->rx_adv_conf.vmdq_dcb_conf);
                        if (! (conf->nb_queue_pools == ETH_16_POOLS ||
@@ -1081,7 +1030,7 @@ rte_eth_dev_check_mq_mode(uint8_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q,
                                PMD_DEBUG_TRACE("ethdev port_id=%d VMDQ+DCB selected, "
                                                "nb_queue_pools must be %d or %d\n",
                                                port_id, ETH_16_POOLS, ETH_32_POOLS);
-                               return (-EINVAL);
+                               return -EINVAL;
                        }
                }
                if (dev_conf->txmode.mq_mode == ETH_MQ_TX_VMDQ_DCB) {
@@ -1091,7 +1040,7 @@ rte_eth_dev_check_mq_mode(uint8_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q,
                                PMD_DEBUG_TRACE("ethdev port_id=%d VMDQ+DCB, nb_tx_q "
                                                "!= %d\n",
                                                port_id, ETH_VMDQ_DCB_NUM_QUEUES);
-                               return (-EINVAL);
+                               return -EINVAL;
                        }
                        conf = &(dev_conf->tx_adv_conf.vmdq_dcb_tx_conf);
                        if (! (conf->nb_queue_pools == ETH_16_POOLS ||
@@ -1100,7 +1049,7 @@ rte_eth_dev_check_mq_mode(uint8_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q,
                                                "nb_queue_pools != %d or nb_queue_pools "
                                                "!= %d\n",
                                                port_id, ETH_16_POOLS, ETH_32_POOLS);
-                               return (-EINVAL);
+                               return -EINVAL;
                        }
                }
 
@@ -1112,7 +1061,7 @@ rte_eth_dev_check_mq_mode(uint8_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q,
                                PMD_DEBUG_TRACE("ethdev port_id=%d DCB, nb_rx_q "
                                                "!= %d\n",
                                                port_id, ETH_DCB_NUM_QUEUES);
-                               return (-EINVAL);
+                               return -EINVAL;
                        }
                        conf = &(dev_conf->rx_adv_conf.dcb_rx_conf);
                        if (! (conf->nb_tcs == ETH_4_TCS ||
@@ -1121,7 +1070,7 @@ rte_eth_dev_check_mq_mode(uint8_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q,
                                                "nb_tcs != %d or nb_tcs "
                                                "!= %d\n",
                                                port_id, ETH_4_TCS, ETH_8_TCS);
-                               return (-EINVAL);
+                               return -EINVAL;
                        }
                }
 
@@ -1132,7 +1081,7 @@ rte_eth_dev_check_mq_mode(uint8_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q,
                                PMD_DEBUG_TRACE("ethdev port_id=%d DCB, nb_tx_q "
                                                "!= %d\n",
                                                port_id, ETH_DCB_NUM_QUEUES);
-                               return (-EINVAL);
+                               return -EINVAL;
                        }
                        conf = &(dev_conf->tx_adv_conf.dcb_tx_conf);
                        if (! (conf->nb_tcs == ETH_4_TCS ||
@@ -1141,7 +1090,7 @@ rte_eth_dev_check_mq_mode(uint8_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q,
                                                "nb_tcs != %d or nb_tcs "
                                                "!= %d\n",
                                                port_id, ETH_4_TCS, ETH_8_TCS);
-                               return (-EINVAL);
+                               return -EINVAL;
                        }
                }
        }
@@ -1162,7 +1111,21 @@ rte_eth_dev_configure(uint8_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q,
 
        if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return (-EINVAL);
+               return -EINVAL;
+       }
+
+       if (nb_rx_q > RTE_MAX_QUEUES_PER_PORT) {
+               PMD_DEBUG_TRACE(
+                       "Number of RX queues requested (%u) is greater than max supported(%d)\n",
+                       nb_rx_q, RTE_MAX_QUEUES_PER_PORT);
+               return -EINVAL;
+       }
+
+       if (nb_tx_q > RTE_MAX_QUEUES_PER_PORT) {
+               PMD_DEBUG_TRACE(
+                       "Number of TX queues requested (%u) is greater than max supported(%d)\n",
+                       nb_tx_q, RTE_MAX_QUEUES_PER_PORT);
+               return -EINVAL;
        }
 
        dev = &rte_eth_devices[port_id];
@@ -1173,7 +1136,7 @@ rte_eth_dev_configure(uint8_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q,
        if (dev->data->dev_started) {
                PMD_DEBUG_TRACE(
                    "port %d must be stopped to allow configuration\n", port_id);
-               return (-EBUSY);
+               return -EBUSY;
        }
 
        /*
@@ -1185,21 +1148,21 @@ rte_eth_dev_configure(uint8_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q,
        if (nb_rx_q > dev_info.max_rx_queues) {
                PMD_DEBUG_TRACE("ethdev port_id=%d nb_rx_queues=%d > %d\n",
                                port_id, nb_rx_q, dev_info.max_rx_queues);
-               return (-EINVAL);
+               return -EINVAL;
        }
        if (nb_rx_q == 0) {
                PMD_DEBUG_TRACE("ethdev port_id=%d nb_rx_q == 0\n", port_id);
-               return (-EINVAL);
+               return -EINVAL;
        }
 
        if (nb_tx_q > dev_info.max_tx_queues) {
                PMD_DEBUG_TRACE("ethdev port_id=%d nb_tx_queues=%d > %d\n",
                                port_id, nb_tx_q, dev_info.max_tx_queues);
-               return (-EINVAL);
+               return -EINVAL;
        }
        if (nb_tx_q == 0) {
                PMD_DEBUG_TRACE("ethdev port_id=%d nb_tx_q == 0\n", port_id);
-               return (-EINVAL);
+               return -EINVAL;
        }
 
        /* Copy the dev_conf parameter into the dev structure */
@@ -1215,7 +1178,7 @@ rte_eth_dev_configure(uint8_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q,
                if (!(pci_drv->drv_flags & RTE_PCI_DRV_INTR_LSC)) {
                        PMD_DEBUG_TRACE("driver %s does not support lsc\n",
                                        pci_drv->name);
-                       return (-EINVAL);
+                       return -EINVAL;
                }
        }
 
@@ -1231,7 +1194,7 @@ rte_eth_dev_configure(uint8_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q,
                                port_id,
                                (unsigned)dev_conf->rxmode.max_rx_pkt_len,
                                (unsigned)dev_info.max_rx_pktlen);
-                       return (-EINVAL);
+                       return -EINVAL;
                }
                else if (dev_conf->rxmode.max_rx_pkt_len < ETHER_MIN_LEN) {
                        PMD_DEBUG_TRACE("ethdev port_id=%d max_rx_pkt_len %u"
@@ -1239,7 +1202,7 @@ rte_eth_dev_configure(uint8_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q,
                                port_id,
                                (unsigned)dev_conf->rxmode.max_rx_pkt_len,
                                (unsigned)ETHER_MIN_LEN);
-                       return (-EINVAL);
+                       return -EINVAL;
                }
        } else {
                if (dev_conf->rxmode.max_rx_pkt_len < ETHER_MIN_LEN ||
@@ -1348,7 +1311,7 @@ rte_eth_dev_start(uint8_t port_id)
 
        if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return (-EINVAL);
+               return -EINVAL;
        }
 
        dev = &rte_eth_devices[port_id];
@@ -1359,7 +1322,7 @@ rte_eth_dev_start(uint8_t port_id)
                PMD_DEBUG_TRACE("Device with port_id=%" PRIu8
                        " already started\n",
                        port_id);
-               return (0);
+               return 0;
        }
 
        diag = (*dev->dev_ops->dev_start)(dev);
@@ -1476,7 +1439,6 @@ rte_eth_rx_queue_setup(uint8_t port_id, uint16_t rx_queue_id,
        int ret;
        uint32_t mbp_buf_size;
        struct rte_eth_dev *dev;
-       struct rte_pktmbuf_pool_private *mbp_priv;
        struct rte_eth_dev_info dev_info;
 
        /* This function is only safe when called from the primary process
@@ -1485,13 +1447,13 @@ rte_eth_rx_queue_setup(uint8_t port_id, uint16_t rx_queue_id,
 
        if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return (-EINVAL);
+               return -EINVAL;
        }
 
        dev = &rte_eth_devices[port_id];
        if (rx_queue_id >= dev->data->nb_rx_queues) {
                PMD_DEBUG_TRACE("Invalid RX queue_id=%d\n", rx_queue_id);
-               return (-EINVAL);
+               return -EINVAL;
        }
 
        if (dev->data->dev_started) {
@@ -1513,10 +1475,9 @@ rte_eth_rx_queue_setup(uint8_t port_id, uint16_t rx_queue_id,
                PMD_DEBUG_TRACE("%s private_data_size %d < %d\n",
                                mp->name, (int) mp->private_data_size,
                                (int) sizeof(struct rte_pktmbuf_pool_private));
-               return (-ENOSPC);
+               return -ENOSPC;
        }
-       mbp_priv = rte_mempool_get_priv(mp);
-       mbp_buf_size = mbp_priv->mbuf_data_room_size;
+       mbp_buf_size = rte_pktmbuf_data_room_size(mp);
 
        if ((mbp_buf_size - RTE_PKTMBUF_HEADROOM) < dev_info.min_rx_bufsize) {
                PMD_DEBUG_TRACE("%s mbuf_data_room_size %d < %d "
@@ -1528,7 +1489,7 @@ rte_eth_rx_queue_setup(uint8_t port_id, uint16_t rx_queue_id,
                                      dev_info.min_rx_bufsize),
                                (int)RTE_PKTMBUF_HEADROOM,
                                (int)dev_info.min_rx_bufsize);
-               return (-EINVAL);
+               return -EINVAL;
        }
 
        if (rx_conf == NULL)
@@ -1559,13 +1520,13 @@ rte_eth_tx_queue_setup(uint8_t port_id, uint16_t tx_queue_id,
 
        if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return (-EINVAL);
+               return -EINVAL;
        }
 
        dev = &rte_eth_devices[port_id];
        if (tx_queue_id >= dev->data->nb_tx_queues) {
                PMD_DEBUG_TRACE("Invalid TX queue_id=%d\n", tx_queue_id);
-               return (-EINVAL);
+               return -EINVAL;
        }
 
        if (dev->data->dev_started) {
@@ -1745,7 +1706,7 @@ rte_eth_stats_get(uint8_t port_id, struct rte_eth_stats *stats)
 
        if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return (-ENODEV);
+               return -ENODEV;
        }
 
        dev = &rte_eth_devices[port_id];
@@ -1951,7 +1912,7 @@ rte_eth_dev_get_mtu(uint8_t port_id, uint16_t *mtu)
 
        if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return (-ENODEV);
+               return -ENODEV;
        }
 
        dev = &rte_eth_devices[port_id];
@@ -1967,7 +1928,7 @@ rte_eth_dev_set_mtu(uint8_t port_id, uint16_t mtu)
 
        if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return (-ENODEV);
+               return -ENODEV;
        }
 
        dev = &rte_eth_devices[port_id];
@@ -1987,23 +1948,23 @@ rte_eth_dev_vlan_filter(uint8_t port_id, uint16_t vlan_id, int on)
 
        if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return (-ENODEV);
+               return -ENODEV;
        }
 
        dev = &rte_eth_devices[port_id];
        if (! (dev->data->dev_conf.rxmode.hw_vlan_filter)) {
                PMD_DEBUG_TRACE("port %d: vlan-filtering disabled\n", port_id);
-               return (-ENOSYS);
+               return -ENOSYS;
        }
 
        if (vlan_id > 4095) {
                PMD_DEBUG_TRACE("(port_id=%d) invalid vlan_id=%u > 4095\n",
                                port_id, (unsigned) vlan_id);
-               return (-EINVAL);
+               return -EINVAL;
        }
        FUNC_PTR_OR_ERR_RET(*dev->dev_ops->vlan_filter_set, -ENOTSUP);
-       (*dev->dev_ops->vlan_filter_set)(dev, vlan_id, on);
-       return (0);
+
+       return (*dev->dev_ops->vlan_filter_set)(dev, vlan_id, on);
 }
 
 int
@@ -2013,19 +1974,19 @@ rte_eth_dev_set_vlan_strip_on_queue(uint8_t port_id, uint16_t rx_queue_id, int o
 
        if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return (-ENODEV);
+               return -ENODEV;
        }
 
        dev = &rte_eth_devices[port_id];
        if (rx_queue_id >= dev->data->nb_rx_queues) {
                PMD_DEBUG_TRACE("Invalid rx_queue_id=%d\n", port_id);
-               return (-EINVAL);
+               return -EINVAL;
        }
 
        FUNC_PTR_OR_ERR_RET(*dev->dev_ops->vlan_strip_queue_set, -ENOTSUP);
        (*dev->dev_ops->vlan_strip_queue_set)(dev, rx_queue_id, on);
 
-       return (0);
+       return 0;
 }
 
 int
@@ -2035,14 +1996,14 @@ rte_eth_dev_set_vlan_ether_type(uint8_t port_id, uint16_t tpid)
 
        if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return (-ENODEV);
+               return -ENODEV;
        }
 
        dev = &rte_eth_devices[port_id];
        FUNC_PTR_OR_ERR_RET(*dev->dev_ops->vlan_tpid_set, -ENOTSUP);
        (*dev->dev_ops->vlan_tpid_set)(dev, tpid);
 
-       return (0);
+       return 0;
 }
 
 int
@@ -2055,7 +2016,7 @@ rte_eth_dev_set_vlan_offload(uint8_t port_id, int offload_mask)
 
        if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return (-ENODEV);
+               return -ENODEV;
        }
 
        dev = &rte_eth_devices[port_id];
@@ -2100,7 +2061,7 @@ rte_eth_dev_get_vlan_offload(uint8_t port_id)
 
        if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return (-ENODEV);
+               return -ENODEV;
        }
 
        dev = &rte_eth_devices[port_id];
@@ -2124,7 +2085,7 @@ rte_eth_dev_set_vlan_pvid(uint8_t port_id, uint16_t pvid, int on)
 
        if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return (-ENODEV);
+               return -ENODEV;
        }
 
        dev = &rte_eth_devices[port_id];
@@ -2143,7 +2104,7 @@ rte_eth_dev_fdir_add_signature_filter(uint8_t port_id,
 
        if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return (-ENODEV);
+               return -ENODEV;
        }
 
        dev = &rte_eth_devices[port_id];
@@ -2151,7 +2112,7 @@ rte_eth_dev_fdir_add_signature_filter(uint8_t port_id,
        if (dev->data->dev_conf.fdir_conf.mode != RTE_FDIR_MODE_SIGNATURE) {
                PMD_DEBUG_TRACE("port %d: invalid FDIR mode=%u\n",
                                port_id, dev->data->dev_conf.fdir_conf.mode);
-               return (-ENOSYS);
+               return -ENOSYS;
        }
 
        if ((fdir_filter->l4type == RTE_FDIR_L4TYPE_SCTP
@@ -2160,7 +2121,7 @@ rte_eth_dev_fdir_add_signature_filter(uint8_t port_id,
                PMD_DEBUG_TRACE(" Port are meaningless for SCTP and " \
                                "None l4type, source & destinations ports " \
                                "should be null!\n");
-               return (-EINVAL);
+               return -EINVAL;
        }
 
        FUNC_PTR_OR_ERR_RET(*dev->dev_ops->fdir_add_signature_filter, -ENOTSUP);
@@ -2177,7 +2138,7 @@ rte_eth_dev_fdir_update_signature_filter(uint8_t port_id,
 
        if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return (-ENODEV);
+               return -ENODEV;
        }
 
        dev = &rte_eth_devices[port_id];
@@ -2185,7 +2146,7 @@ rte_eth_dev_fdir_update_signature_filter(uint8_t port_id,
        if (dev->data->dev_conf.fdir_conf.mode != RTE_FDIR_MODE_SIGNATURE) {
                PMD_DEBUG_TRACE("port %d: invalid FDIR mode=%u\n",
                                port_id, dev->data->dev_conf.fdir_conf.mode);
-               return (-ENOSYS);
+               return -ENOSYS;
        }
 
        if ((fdir_filter->l4type == RTE_FDIR_L4TYPE_SCTP
@@ -2194,7 +2155,7 @@ rte_eth_dev_fdir_update_signature_filter(uint8_t port_id,
                PMD_DEBUG_TRACE(" Port are meaningless for SCTP and " \
                                "None l4type, source & destinations ports " \
                                "should be null!\n");
-               return (-EINVAL);
+               return -EINVAL;
        }
 
        FUNC_PTR_OR_ERR_RET(*dev->dev_ops->fdir_update_signature_filter, -ENOTSUP);
@@ -2211,7 +2172,7 @@ rte_eth_dev_fdir_remove_signature_filter(uint8_t port_id,
 
        if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return (-ENODEV);
+               return -ENODEV;
        }
 
        dev = &rte_eth_devices[port_id];
@@ -2219,7 +2180,7 @@ rte_eth_dev_fdir_remove_signature_filter(uint8_t port_id,
        if (dev->data->dev_conf.fdir_conf.mode != RTE_FDIR_MODE_SIGNATURE) {
                PMD_DEBUG_TRACE("port %d: invalid FDIR mode=%u\n",
                                port_id, dev->data->dev_conf.fdir_conf.mode);
-               return (-ENOSYS);
+               return -ENOSYS;
        }
 
        if ((fdir_filter->l4type == RTE_FDIR_L4TYPE_SCTP
@@ -2228,7 +2189,7 @@ rte_eth_dev_fdir_remove_signature_filter(uint8_t port_id,
                PMD_DEBUG_TRACE(" Port are meaningless for SCTP and " \
                                "None l4type source & destinations ports " \
                                "should be null!\n");
-               return (-EINVAL);
+               return -EINVAL;
        }
 
        FUNC_PTR_OR_ERR_RET(*dev->dev_ops->fdir_remove_signature_filter, -ENOTSUP);
@@ -2242,19 +2203,19 @@ rte_eth_dev_fdir_get_infos(uint8_t port_id, struct rte_eth_fdir *fdir)
 
        if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return (-ENODEV);
+               return -ENODEV;
        }
 
        dev = &rte_eth_devices[port_id];
        if (! (dev->data->dev_conf.fdir_conf.mode)) {
                PMD_DEBUG_TRACE("port %d: pkt-filter disabled\n", port_id);
-               return (-ENOSYS);
+               return -ENOSYS;
        }
 
        FUNC_PTR_OR_ERR_RET(*dev->dev_ops->fdir_infos_get, -ENOTSUP);
 
        (*dev->dev_ops->fdir_infos_get)(dev, fdir);
-       return (0);
+       return 0;
 }
 
 int
@@ -2267,7 +2228,7 @@ rte_eth_dev_fdir_add_perfect_filter(uint8_t port_id,
 
        if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return (-ENODEV);
+               return -ENODEV;
        }
 
        dev = &rte_eth_devices[port_id];
@@ -2275,7 +2236,7 @@ rte_eth_dev_fdir_add_perfect_filter(uint8_t port_id,
        if (dev->data->dev_conf.fdir_conf.mode != RTE_FDIR_MODE_PERFECT) {
                PMD_DEBUG_TRACE("port %d: invalid FDIR mode=%u\n",
                                port_id, dev->data->dev_conf.fdir_conf.mode);
-               return (-ENOSYS);
+               return -ENOSYS;
        }
 
        if ((fdir_filter->l4type == RTE_FDIR_L4TYPE_SCTP
@@ -2284,12 +2245,12 @@ rte_eth_dev_fdir_add_perfect_filter(uint8_t port_id,
                PMD_DEBUG_TRACE(" Port are meaningless for SCTP and " \
                                "None l4type, source & destinations ports " \
                                "should be null!\n");
-               return (-EINVAL);
+               return -EINVAL;
        }
 
        /* For now IPv6 is not supported with perfect filter */
        if (fdir_filter->iptype == RTE_FDIR_IPTYPE_IPV6)
-               return (-ENOTSUP);
+               return -ENOTSUP;
 
        FUNC_PTR_OR_ERR_RET(*dev->dev_ops->fdir_add_perfect_filter, -ENOTSUP);
        return (*dev->dev_ops->fdir_add_perfect_filter)(dev, fdir_filter,
@@ -2307,7 +2268,7 @@ rte_eth_dev_fdir_update_perfect_filter(uint8_t port_id,
 
        if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return (-ENODEV);
+               return -ENODEV;
        }
 
        dev = &rte_eth_devices[port_id];
@@ -2315,7 +2276,7 @@ rte_eth_dev_fdir_update_perfect_filter(uint8_t port_id,
        if (dev->data->dev_conf.fdir_conf.mode != RTE_FDIR_MODE_PERFECT) {
                PMD_DEBUG_TRACE("port %d: invalid FDIR mode=%u\n",
                                port_id, dev->data->dev_conf.fdir_conf.mode);
-               return (-ENOSYS);
+               return -ENOSYS;
        }
 
        if ((fdir_filter->l4type == RTE_FDIR_L4TYPE_SCTP
@@ -2324,12 +2285,12 @@ rte_eth_dev_fdir_update_perfect_filter(uint8_t port_id,
                PMD_DEBUG_TRACE(" Port are meaningless for SCTP and " \
                                "None l4type, source & destinations ports " \
                                "should be null!\n");
-               return (-EINVAL);
+               return -EINVAL;
        }
 
        /* For now IPv6 is not supported with perfect filter */
        if (fdir_filter->iptype == RTE_FDIR_IPTYPE_IPV6)
-               return (-ENOTSUP);
+               return -ENOTSUP;
 
        FUNC_PTR_OR_ERR_RET(*dev->dev_ops->fdir_update_perfect_filter, -ENOTSUP);
        return (*dev->dev_ops->fdir_update_perfect_filter)(dev, fdir_filter,
@@ -2345,7 +2306,7 @@ rte_eth_dev_fdir_remove_perfect_filter(uint8_t port_id,
 
        if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return (-ENODEV);
+               return -ENODEV;
        }
 
        dev = &rte_eth_devices[port_id];
@@ -2353,7 +2314,7 @@ rte_eth_dev_fdir_remove_perfect_filter(uint8_t port_id,
        if (dev->data->dev_conf.fdir_conf.mode != RTE_FDIR_MODE_PERFECT) {
                PMD_DEBUG_TRACE("port %d: invalid FDIR mode=%u\n",
                                port_id, dev->data->dev_conf.fdir_conf.mode);
-               return (-ENOSYS);
+               return -ENOSYS;
        }
 
        if ((fdir_filter->l4type == RTE_FDIR_L4TYPE_SCTP
@@ -2362,12 +2323,12 @@ rte_eth_dev_fdir_remove_perfect_filter(uint8_t port_id,
                PMD_DEBUG_TRACE(" Port are meaningless for SCTP and " \
                                "None l4type, source & destinations ports " \
                                "should be null!\n");
-               return (-EINVAL);
+               return -EINVAL;
        }
 
        /* For now IPv6 is not supported with perfect filter */
        if (fdir_filter->iptype == RTE_FDIR_IPTYPE_IPV6)
-               return (-ENOTSUP);
+               return -ENOTSUP;
 
        FUNC_PTR_OR_ERR_RET(*dev->dev_ops->fdir_remove_perfect_filter, -ENOTSUP);
        return (*dev->dev_ops->fdir_remove_perfect_filter)(dev, fdir_filter,
@@ -2381,13 +2342,13 @@ rte_eth_dev_fdir_set_masks(uint8_t port_id, struct rte_fdir_masks *fdir_mask)
 
        if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return (-ENODEV);
+               return -ENODEV;
        }
 
        dev = &rte_eth_devices[port_id];
        if (! (dev->data->dev_conf.fdir_conf.mode)) {
                PMD_DEBUG_TRACE("port %d: pkt-filter disabled\n", port_id);
-               return (-ENOSYS);
+               return -ENOSYS;
        }
 
        FUNC_PTR_OR_ERR_RET(*dev->dev_ops->fdir_set_masks, -ENOTSUP);
@@ -2401,7 +2362,7 @@ rte_eth_dev_flow_ctrl_get(uint8_t port_id, struct rte_eth_fc_conf *fc_conf)
 
        if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return (-ENODEV);
+               return -ENODEV;
        }
 
        dev = &rte_eth_devices[port_id];
@@ -2417,12 +2378,12 @@ rte_eth_dev_flow_ctrl_set(uint8_t port_id, struct rte_eth_fc_conf *fc_conf)
 
        if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return (-ENODEV);
+               return -ENODEV;
        }
 
        if ((fc_conf->send_xon != 0) && (fc_conf->send_xon != 1)) {
                PMD_DEBUG_TRACE("Invalid send_xon, only 0/1 allowed\n");
-               return (-EINVAL);
+               return -EINVAL;
        }
 
        dev = &rte_eth_devices[port_id];
@@ -2437,22 +2398,22 @@ rte_eth_dev_priority_flow_ctrl_set(uint8_t port_id, struct rte_eth_pfc_conf *pfc
 
        if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return (-ENODEV);
+               return -ENODEV;
        }
 
        if (pfc_conf->priority > (ETH_DCB_NUM_USER_PRIORITIES - 1)) {
                PMD_DEBUG_TRACE("Invalid priority, only 0-7 allowed\n");
-               return (-EINVAL);
+               return -EINVAL;
        }
 
        dev = &rte_eth_devices[port_id];
        /* High water, low water validation are device specific */
        if  (*dev->dev_ops->priority_flow_ctrl_set)
                return (*dev->dev_ops->priority_flow_ctrl_set)(dev, pfc_conf);
-       return (-ENOTSUP);
+       return -ENOTSUP;
 }
 
-static inline int
+static int
 rte_eth_check_reta_mask(struct rte_eth_rss_reta_entry64 *reta_conf,
                        uint16_t reta_size)
 {
@@ -2476,7 +2437,7 @@ rte_eth_check_reta_mask(struct rte_eth_rss_reta_entry64 *reta_conf,
        return -EINVAL;
 }
 
-static inline int
+static int
 rte_eth_check_reta_entry(struct rte_eth_rss_reta_entry64 *reta_conf,
                         uint16_t reta_size,
                         uint8_t max_rxq)
@@ -2567,7 +2528,7 @@ rte_eth_dev_rss_hash_update(uint8_t port_id, struct rte_eth_rss_conf *rss_conf)
 
        if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return (-ENODEV);
+               return -ENODEV;
        }
 
        rss_hash_protos = rss_conf->rss_hf;
@@ -2575,7 +2536,7 @@ rte_eth_dev_rss_hash_update(uint8_t port_id, struct rte_eth_rss_conf *rss_conf)
            ((rss_hash_protos & ETH_RSS_PROTO_MASK) == 0)) {
                PMD_DEBUG_TRACE("Invalid rss_hash_protos=0x%x\n",
                                rss_hash_protos);
-               return (-EINVAL);
+               return -EINVAL;
        }
        dev = &rte_eth_devices[port_id];
        FUNC_PTR_OR_ERR_RET(*dev->dev_ops->rss_hash_update, -ENOTSUP);
@@ -2590,7 +2551,7 @@ rte_eth_dev_rss_hash_conf_get(uint8_t port_id,
 
        if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return (-ENODEV);
+               return -ENODEV;
        }
 
        dev = &rte_eth_devices[port_id];
@@ -2658,12 +2619,12 @@ rte_eth_led_on(uint8_t port_id)
 
        if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return (-ENODEV);
+               return -ENODEV;
        }
 
        dev = &rte_eth_devices[port_id];
        FUNC_PTR_OR_ERR_RET(*dev->dev_ops->dev_led_on, -ENOTSUP);
-       return ((*dev->dev_ops->dev_led_on)(dev));
+       return (*dev->dev_ops->dev_led_on)(dev);
 }
 
 int
@@ -2673,20 +2634,20 @@ rte_eth_led_off(uint8_t port_id)
 
        if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return (-ENODEV);
+               return -ENODEV;
        }
 
        dev = &rte_eth_devices[port_id];
        FUNC_PTR_OR_ERR_RET(*dev->dev_ops->dev_led_off, -ENOTSUP);
-       return ((*dev->dev_ops->dev_led_off)(dev));
+       return (*dev->dev_ops->dev_led_off)(dev);
 }
 
 /*
  * Returns index into MAC address array of addr. Use 00:00:00:00:00:00 to find
  * an empty spot.
  */
-static inline int
-get_mac_addr_index(uint8_t port_id, struct ether_addr *addr)
+static int
+get_mac_addr_index(uint8_t port_id, const struct ether_addr *addr)
 {
        struct rte_eth_dev_info dev_info;
        struct rte_eth_dev *dev = &rte_eth_devices[port_id];
@@ -2701,7 +2662,7 @@ get_mac_addr_index(uint8_t port_id, struct ether_addr *addr)
        return -1;
 }
 
-static struct ether_addr null_mac_addr = {{0, 0, 0, 0, 0, 0}};
+static const struct ether_addr null_mac_addr;
 
 int
 rte_eth_dev_mac_addr_add(uint8_t port_id, struct ether_addr *addr,
@@ -2713,7 +2674,7 @@ rte_eth_dev_mac_addr_add(uint8_t port_id, struct ether_addr *addr,
 
        if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return (-ENODEV);
+               return -ENODEV;
        }
 
        dev = &rte_eth_devices[port_id];
@@ -2722,11 +2683,11 @@ rte_eth_dev_mac_addr_add(uint8_t port_id, struct ether_addr *addr,
        if (is_zero_ether_addr(addr)) {
                PMD_DEBUG_TRACE("port %d: Cannot add NULL MAC address\n",
                        port_id);
-               return (-EINVAL);
+               return -EINVAL;
        }
        if (pool >= ETH_64_POOLS) {
                PMD_DEBUG_TRACE("pool id must be 0-%d\n",ETH_64_POOLS - 1);
-               return (-EINVAL);
+               return -EINVAL;
        }
 
        index = get_mac_addr_index(port_id, addr);
@@ -2735,7 +2696,7 @@ rte_eth_dev_mac_addr_add(uint8_t port_id, struct ether_addr *addr,
                if (index < 0) {
                        PMD_DEBUG_TRACE("port %d: MAC address array full\n",
                                port_id);
-                       return (-ENOSPC);
+                       return -ENOSPC;
                }
        } else {
                pool_mask = dev->data->mac_pool_sel[index];
@@ -2765,7 +2726,7 @@ rte_eth_dev_mac_addr_remove(uint8_t port_id, struct ether_addr *addr)
 
        if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return (-ENODEV);
+               return -ENODEV;
        }
 
        dev = &rte_eth_devices[port_id];
@@ -2774,7 +2735,7 @@ rte_eth_dev_mac_addr_remove(uint8_t port_id, struct ether_addr *addr)
        index = get_mac_addr_index(port_id, addr);
        if (index == 0) {
                PMD_DEBUG_TRACE("port %d: Cannot remove default MAC address\n", port_id);
-               return (-EADDRINUSE);
+               return -EADDRINUSE;
        } else if (index < 0)
                return 0;  /* Do nothing if address wasn't found */
 
@@ -2801,7 +2762,7 @@ rte_eth_dev_set_vf_rxmode(uint8_t port_id,  uint16_t vf,
        if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("set VF RX mode:Invalid port_id=%d\n",
                                port_id);
-               return (-ENODEV);
+               return -ENODEV;
        }
 
        dev = &rte_eth_devices[port_id];
@@ -2811,12 +2772,12 @@ rte_eth_dev_set_vf_rxmode(uint8_t port_id,  uint16_t vf,
        if (vf > num_vfs)
        {
                PMD_DEBUG_TRACE("set VF RX mode:invalid VF id %d\n", vf);
-               return (-EINVAL);
+               return -EINVAL;
        }
        if (rx_mode == 0)
        {
                PMD_DEBUG_TRACE("set VF RX mode:mode mask ca not be zero\n");
-               return (-EINVAL);
+               return -EINVAL;
        }
        FUNC_PTR_OR_ERR_RET(*dev->dev_ops->set_vf_rx_mode, -ENOTSUP);
        return (*dev->dev_ops->set_vf_rx_mode)(dev, vf, rx_mode, on);
@@ -2826,8 +2787,8 @@ rte_eth_dev_set_vf_rxmode(uint8_t port_id,  uint16_t vf,
  * Returns index into MAC address array of addr. Use 00:00:00:00:00:00 to find
  * an empty spot.
  */
-static inline int
-get_hash_mac_addr_index(uint8_t port_id, struct ether_addr *addr)
+static int
+get_hash_mac_addr_index(uint8_t port_id, const struct ether_addr *addr)
 {
        struct rte_eth_dev_info dev_info;
        struct rte_eth_dev *dev = &rte_eth_devices[port_id];
@@ -2856,14 +2817,14 @@ rte_eth_dev_uc_hash_table_set(uint8_t port_id, struct ether_addr *addr,
        if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("unicast hash setting:Invalid port_id=%d\n",
                        port_id);
-               return (-ENODEV);
+               return -ENODEV;
        }
 
        dev = &rte_eth_devices[port_id];
        if (is_zero_ether_addr(addr)) {
                PMD_DEBUG_TRACE("port %d: Cannot add NULL MAC address\n",
                        port_id);
-               return (-EINVAL);
+               return -EINVAL;
        }
 
        index = get_hash_mac_addr_index(port_id, addr);
@@ -2875,14 +2836,14 @@ rte_eth_dev_uc_hash_table_set(uint8_t port_id, struct ether_addr *addr,
                if (!on) {
                        PMD_DEBUG_TRACE("port %d: the MAC address was not"
                                "set in UTA\n", port_id);
-                       return (-EINVAL);
+                       return -EINVAL;
                }
 
                index = get_hash_mac_addr_index(port_id, &null_mac_addr);
                if (index < 0) {
                        PMD_DEBUG_TRACE("port %d: MAC address array full\n",
                                        port_id);
-                       return (-ENOSPC);
+                       return -ENOSPC;
                }
        }
 
@@ -2909,7 +2870,7 @@ rte_eth_dev_uc_all_hash_table_set(uint8_t port_id, uint8_t on)
        if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("unicast hash setting:Invalid port_id=%d\n",
                        port_id);
-               return (-ENODEV);
+               return -ENODEV;
        }
 
        dev = &rte_eth_devices[port_id];
@@ -2927,7 +2888,7 @@ rte_eth_dev_set_vf_rx(uint8_t port_id,uint16_t vf, uint8_t on)
 
        if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return (-ENODEV);
+               return -ENODEV;
        }
 
        dev = &rte_eth_devices[port_id];
@@ -2937,7 +2898,7 @@ rte_eth_dev_set_vf_rx(uint8_t port_id,uint16_t vf, uint8_t on)
        if (vf > num_vfs)
        {
                PMD_DEBUG_TRACE("port %d: invalid vf id\n", port_id);
-               return (-EINVAL);
+               return -EINVAL;
        }
 
        FUNC_PTR_OR_ERR_RET(*dev->dev_ops->set_vf_rx, -ENOTSUP);
@@ -2953,7 +2914,7 @@ rte_eth_dev_set_vf_tx(uint8_t port_id,uint16_t vf, uint8_t on)
 
        if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("set pool tx:Invalid port_id=%d\n", port_id);
-               return (-ENODEV);
+               return -ENODEV;
        }
 
        dev = &rte_eth_devices[port_id];
@@ -2963,7 +2924,7 @@ rte_eth_dev_set_vf_tx(uint8_t port_id,uint16_t vf, uint8_t on)
        if (vf > num_vfs)
        {
                PMD_DEBUG_TRACE("set pool tx:invalid pool id=%d\n", vf);
-               return (-EINVAL);
+               return -EINVAL;
        }
 
        FUNC_PTR_OR_ERR_RET(*dev->dev_ops->set_vf_tx, -ENOTSUP);
@@ -2979,7 +2940,7 @@ rte_eth_dev_set_vf_vlan_filter(uint8_t port_id, uint16_t vlan_id,
        if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("VF VLAN filter:invalid port id=%d\n",
                                port_id);
-               return (-ENODEV);
+               return -ENODEV;
        }
        dev = &rte_eth_devices[port_id];
 
@@ -2987,12 +2948,12 @@ rte_eth_dev_set_vf_vlan_filter(uint8_t port_id, uint16_t vlan_id,
        {
                PMD_DEBUG_TRACE("VF VLAN filter:invalid VLAN id=%d\n",
                        vlan_id);
-               return (-EINVAL);
+               return -EINVAL;
        }
        if (vf_mask == 0)
        {
                PMD_DEBUG_TRACE("VF VLAN filter:pool_mask can not be 0\n");
-               return (-EINVAL);
+               return -EINVAL;
        }
 
        FUNC_PTR_OR_ERR_RET(*dev->dev_ops->set_vf_vlan_filter, -ENOTSUP);
@@ -3080,32 +3041,32 @@ rte_eth_mirror_rule_set(uint8_t port_id,
 
        if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return (-ENODEV);
+               return -ENODEV;
        }
 
        if (mirror_conf->rule_type_mask == 0) {
                PMD_DEBUG_TRACE("mirror rule type can not be 0.\n");
-               return (-EINVAL);
+               return -EINVAL;
        }
 
        if (mirror_conf->dst_pool >= ETH_64_POOLS) {
                PMD_DEBUG_TRACE("Invalid dst pool, pool id must"
                        "be 0-%d\n",ETH_64_POOLS - 1);
-               return (-EINVAL);
+               return -EINVAL;
        }
 
        if ((mirror_conf->rule_type_mask & ETH_VMDQ_POOL_MIRROR) &&
                (mirror_conf->pool_mask == 0)) {
                PMD_DEBUG_TRACE("Invalid mirror pool, pool mask can not"
                                "be 0.\n");
-               return (-EINVAL);
+               return -EINVAL;
        }
 
        if(rule_id >= ETH_VMDQ_NUM_MIRROR_RULE)
        {
                PMD_DEBUG_TRACE("Invalid rule_id, rule_id must be 0-%d\n",
                        ETH_VMDQ_NUM_MIRROR_RULE - 1);
-               return (-EINVAL);
+               return -EINVAL;
        }
 
        dev = &rte_eth_devices[port_id];
@@ -3121,14 +3082,14 @@ rte_eth_mirror_rule_reset(uint8_t port_id, uint8_t rule_id)
 
        if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return (-ENODEV);
+               return -ENODEV;
        }
 
        if(rule_id >= ETH_VMDQ_NUM_MIRROR_RULE)
        {
                PMD_DEBUG_TRACE("Invalid rule_id, rule_id must be 0-%d\n",
                        ETH_VMDQ_NUM_MIRROR_RULE-1);
-               return (-EINVAL);
+               return -EINVAL;
        }
 
        dev = &rte_eth_devices[port_id];
@@ -3203,7 +3164,7 @@ rte_eth_rx_descriptor_done(uint8_t port_id, uint16_t queue_id, uint16_t offset)
 
        if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return (-ENODEV);
+               return -ENODEV;
        }
 
        dev = &rte_eth_devices[port_id];
@@ -3222,11 +3183,11 @@ rte_eth_dev_callback_register(uint8_t port_id,
        struct rte_eth_dev_callback *user_cb;
 
        if (!cb_fn)
-               return (-EINVAL);
+               return -EINVAL;
 
        if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return (-EINVAL);
+               return -EINVAL;
        }
 
        dev = &rte_eth_devices[port_id];
@@ -3250,7 +3211,7 @@ rte_eth_dev_callback_register(uint8_t port_id,
        }
 
        rte_spinlock_unlock(&rte_eth_dev_cb_lock);
-       return ((user_cb == NULL) ? -ENOMEM : 0);
+       return (user_cb == NULL) ? -ENOMEM : 0;
 }
 
 int
@@ -3263,11 +3224,11 @@ rte_eth_dev_callback_unregister(uint8_t port_id,
        struct rte_eth_dev_callback *cb, *next;
 
        if (!cb_fn)
-               return (-EINVAL);
+               return -EINVAL;
 
        if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return (-EINVAL);
+               return -EINVAL;
        }
 
        dev = &rte_eth_devices[port_id];
@@ -3296,7 +3257,7 @@ rte_eth_dev_callback_unregister(uint8_t port_id,
        }
 
        rte_spinlock_unlock(&rte_eth_dev_cb_lock);
-       return (ret);
+       return ret;
 }
 
 void
@@ -3327,12 +3288,12 @@ int rte_eth_dev_bypass_init(uint8_t port_id)
 
        if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return (-ENODEV);
+               return -ENODEV;
        }
 
        if ((dev= &rte_eth_devices[port_id]) == NULL) {
                PMD_DEBUG_TRACE("Invalid port device\n");
-               return (-ENODEV);
+               return -ENODEV;
        }
 
        FUNC_PTR_OR_ERR_RET(*dev->dev_ops->bypass_init, -ENOTSUP);
@@ -3347,12 +3308,12 @@ rte_eth_dev_bypass_state_show(uint8_t port_id, uint32_t *state)
 
        if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return (-ENODEV);
+               return -ENODEV;
        }
 
        if ((dev= &rte_eth_devices[port_id]) == NULL) {
                PMD_DEBUG_TRACE("Invalid port device\n");
-               return (-ENODEV);
+               return -ENODEV;
        }
        FUNC_PTR_OR_ERR_RET(*dev->dev_ops->bypass_state_show, -ENOTSUP);
        (*dev->dev_ops->bypass_state_show)(dev, state);
@@ -3366,12 +3327,12 @@ rte_eth_dev_bypass_state_set(uint8_t port_id, uint32_t *new_state)
 
        if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return (-ENODEV);
+               return -ENODEV;
        }
 
        if ((dev= &rte_eth_devices[port_id]) == NULL) {
                PMD_DEBUG_TRACE("Invalid port device\n");
-               return (-ENODEV);
+               return -ENODEV;
        }
 
        FUNC_PTR_OR_ERR_RET(*dev->dev_ops->bypass_state_set, -ENOTSUP);
@@ -3386,12 +3347,12 @@ rte_eth_dev_bypass_event_show(uint8_t port_id, uint32_t event, uint32_t *state)
 
        if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return (-ENODEV);
+               return -ENODEV;
        }
 
        if ((dev= &rte_eth_devices[port_id]) == NULL) {
                PMD_DEBUG_TRACE("Invalid port device\n");
-               return (-ENODEV);
+               return -ENODEV;
        }
 
        FUNC_PTR_OR_ERR_RET(*dev->dev_ops->bypass_state_show, -ENOTSUP);
@@ -3406,12 +3367,12 @@ rte_eth_dev_bypass_event_store(uint8_t port_id, uint32_t event, uint32_t state)
 
        if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return (-ENODEV);
+               return -ENODEV;
        }
 
        if ((dev= &rte_eth_devices[port_id]) == NULL) {
                PMD_DEBUG_TRACE("Invalid port device\n");
-               return (-ENODEV);
+               return -ENODEV;
        }
 
        FUNC_PTR_OR_ERR_RET(*dev->dev_ops->bypass_event_set, -ENOTSUP);
@@ -3426,12 +3387,12 @@ rte_eth_dev_wd_timeout_store(uint8_t port_id, uint32_t timeout)
 
        if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return (-ENODEV);
+               return -ENODEV;
        }
 
        if ((dev= &rte_eth_devices[port_id]) == NULL) {
                PMD_DEBUG_TRACE("Invalid port device\n");
-               return (-ENODEV);
+               return -ENODEV;
        }
 
        FUNC_PTR_OR_ERR_RET(*dev->dev_ops->bypass_wd_timeout_set, -ENOTSUP);
@@ -3446,12 +3407,12 @@ rte_eth_dev_bypass_ver_show(uint8_t port_id, uint32_t *ver)
 
        if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return (-ENODEV);
+               return -ENODEV;
        }
 
        if ((dev= &rte_eth_devices[port_id]) == NULL) {
                PMD_DEBUG_TRACE("Invalid port device\n");
-               return (-ENODEV);
+               return -ENODEV;
        }
 
        FUNC_PTR_OR_ERR_RET(*dev->dev_ops->bypass_ver_show, -ENOTSUP);
@@ -3466,12 +3427,12 @@ rte_eth_dev_bypass_wd_timeout_show(uint8_t port_id, uint32_t *wd_timeout)
 
        if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return (-ENODEV);
+               return -ENODEV;
        }
 
        if ((dev= &rte_eth_devices[port_id]) == NULL) {
                PMD_DEBUG_TRACE("Invalid port device\n");
-               return (-ENODEV);
+               return -ENODEV;
        }
 
        FUNC_PTR_OR_ERR_RET(*dev->dev_ops->bypass_wd_timeout_show, -ENOTSUP);
@@ -3486,12 +3447,12 @@ rte_eth_dev_bypass_wd_reset(uint8_t port_id)
 
        if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return (-ENODEV);
+               return -ENODEV;
        }
 
        if ((dev= &rte_eth_devices[port_id]) == NULL) {
                PMD_DEBUG_TRACE("Invalid port device\n");
-               return (-ENODEV);
+               return -ENODEV;
        }
 
        FUNC_PTR_OR_ERR_RET(*dev->dev_ops->bypass_wd_reset, -ENOTSUP);
@@ -3534,7 +3495,7 @@ rte_eth_dev_filter_ctrl(uint8_t port_id, enum rte_filter_type filter_type,
 
 void *
 rte_eth_add_rx_callback(uint8_t port_id, uint16_t queue_id,
-               rte_rxtx_callback_fn fn, void *user_param)
+               rte_rx_callback_fn fn, void *user_param)
 {
 #ifndef RTE_ETHDEV_RXTX_CALLBACKS
        rte_errno = ENOTSUP;
@@ -3554,7 +3515,7 @@ rte_eth_add_rx_callback(uint8_t port_id, uint16_t queue_id,
                return NULL;
        }
 
-       cb->fn = fn;
+       cb->fn.rx = fn;
        cb->param = user_param;
        cb->next = rte_eth_devices[port_id].post_rx_burst_cbs[queue_id];
        rte_eth_devices[port_id].post_rx_burst_cbs[queue_id] = cb;
@@ -3563,7 +3524,7 @@ rte_eth_add_rx_callback(uint8_t port_id, uint16_t queue_id,
 
 void *
 rte_eth_add_tx_callback(uint8_t port_id, uint16_t queue_id,
-               rte_rxtx_callback_fn fn, void *user_param)
+               rte_tx_callback_fn fn, void *user_param)
 {
 #ifndef RTE_ETHDEV_RXTX_CALLBACKS
        rte_errno = ENOTSUP;
@@ -3583,7 +3544,7 @@ rte_eth_add_tx_callback(uint8_t port_id, uint16_t queue_id,
                return NULL;
        }
 
-       cb->fn = fn;
+       cb->fn.tx = fn;
        cb->param = user_param;
        cb->next = rte_eth_devices[port_id].pre_tx_burst_cbs[queue_id];
        rte_eth_devices[port_id].pre_tx_burst_cbs[queue_id] = cb;
@@ -3595,12 +3556,12 @@ rte_eth_remove_rx_callback(uint8_t port_id, uint16_t queue_id,
                struct rte_eth_rxtx_callback *user_cb)
 {
 #ifndef RTE_ETHDEV_RXTX_CALLBACKS
-       return (-ENOTSUP);
+       return -ENOTSUP;
 #endif
        /* Check input parameters. */
        if (!rte_eth_dev_is_valid_port(port_id) || user_cb == NULL ||
                    queue_id >= rte_eth_devices[port_id].data->nb_rx_queues) {
-               return (-EINVAL);
+               return -EINVAL;
        }
 
        struct rte_eth_dev *dev = &rte_eth_devices[port_id];
@@ -3626,7 +3587,7 @@ rte_eth_remove_rx_callback(uint8_t port_id, uint16_t queue_id,
        } while (cb != NULL);
 
        /* Callback wasn't found. */
-       return (-EINVAL);
+       return -EINVAL;
 }
 
 int
@@ -3634,12 +3595,12 @@ rte_eth_remove_tx_callback(uint8_t port_id, uint16_t queue_id,
                struct rte_eth_rxtx_callback *user_cb)
 {
 #ifndef RTE_ETHDEV_RXTX_CALLBACKS
-       return (-ENOTSUP);
+       return -ENOTSUP;
 #endif
        /* Check input parameters. */
        if (!rte_eth_dev_is_valid_port(port_id) || user_cb == NULL ||
                    queue_id >= rte_eth_devices[port_id].data->nb_tx_queues) {
-               return (-EINVAL);
+               return -EINVAL;
        }
 
        struct rte_eth_dev *dev = &rte_eth_devices[port_id];
@@ -3665,5 +3626,5 @@ rte_eth_remove_tx_callback(uint8_t port_id, uint16_t queue_id,
        } while (cb != NULL);
 
        /* Callback wasn't found. */
-       return (-EINVAL);
+       return -EINVAL;
 }