build: remove redundant config include

[dpdk.git] / drivers / net / mlx4 / mlx4.c

diff --git a/drivers/net/mlx4/mlx4.c b/drivers/net/mlx4/mlx4.c
index d6e5753..a1dd658 100644 (file)
--- a/drivers/net/mlx4/mlx4.c
+++ b/drivers/net/mlx4/mlx4.c
@@ -8,7 +8,6 @@
  * mlx4 driver initialization.
  */
 
-#include <assert.h>
 #include <dlfcn.h>
 #include <errno.h>
 #include <inttypes.h>
@@ -30,7 +29,6 @@
 #endif
 
 #include <rte_common.h>
-#include <rte_config.h>
 #include <rte_dev.h>
 #include <rte_errno.h>
 #include <rte_ethdev_driver.h>
@@ -162,7 +160,7 @@ mlx4_alloc_verbs_buf(size_t size, void *data)
 
                socket = rxq->socket;
        }
-       assert(data != NULL);
+       MLX4_ASSERT(data != NULL);
        ret = rte_malloc_socket(__func__, size, alignment, socket);
        if (!ret && size)
                rte_errno = ENOMEM;
@@ -180,7 +178,7 @@ mlx4_alloc_verbs_buf(size_t size, void *data)
 static void
 mlx4_free_verbs_buf(void *ptr, void *data __rte_unused)
 {
-       assert(data != NULL);
+       MLX4_ASSERT(data != NULL);
        rte_free(ptr);
 }
 #endif
@@ -248,6 +246,9 @@ mlx4_dev_configure(struct rte_eth_dev *dev)
        struct rte_flow_error error;
        int ret;
 
+       if (dev->data->dev_conf.rxmode.mq_mode & ETH_MQ_RX_RSS_FLAG)
+               dev->data->dev_conf.rxmode.offloads |= DEV_RX_OFFLOAD_RSS_HASH;
+
        /* Prepare internal flow rules. */
        ret = mlx4_flow_sync(priv, &error);
        if (ret) {
@@ -302,7 +303,7 @@ mlx4_dev_start(struct rte_eth_dev *dev)
                      (void *)dev, strerror(-ret));
                goto err;
        }
-#ifndef NDEBUG
+#ifdef RTE_LIBRTE_MLX4_DEBUG
        mlx4_mr_dump_dev(dev);
 #endif
        ret = mlx4_rxq_intr_enable(priv);
@@ -389,11 +390,11 @@ mlx4_dev_close(struct rte_eth_dev *dev)
        mlx4_proc_priv_uninit(dev);
        mlx4_mr_release(dev);
        if (priv->pd != NULL) {
-               assert(priv->ctx != NULL);
+               MLX4_ASSERT(priv->ctx != NULL);
                claim_zero(mlx4_glue->dealloc_pd(priv->pd));
                claim_zero(mlx4_glue->close_device(priv->ctx));
        } else
-               assert(priv->ctx == NULL);
+               MLX4_ASSERT(priv->ctx == NULL);
        mlx4_intr_uninstall(priv);
        memset(priv, 0, sizeof(*priv));
 }
@@ -702,7 +703,7 @@ mlx4_init_once(void)
        if (mlx4_init_shared_data())
                return -rte_errno;
        sd = mlx4_shared_data;
-       assert(sd);
+       MLX4_ASSERT(sd);
        rte_spinlock_lock(&sd->lock);
        switch (rte_eal_process_type()) {
        case RTE_PROC_PRIMARY:
@@ -763,6 +764,7 @@ mlx4_pci_probe(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev)
        };
        unsigned int vf;
        int i;
+       char ifname[IF_NAMESIZE];
 
        (void)pci_drv;
        err = mlx4_init_once();
@@ -771,16 +773,16 @@ mlx4_pci_probe(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev)
                      strerror(rte_errno));
                return -rte_errno;
        }
-       assert(pci_drv == &mlx4_driver);
+       MLX4_ASSERT(pci_drv == &mlx4_driver);
        list = mlx4_glue->get_device_list(&i);
        if (list == NULL) {
                rte_errno = errno;
-               assert(rte_errno);
+               MLX4_ASSERT(rte_errno);
                if (rte_errno == ENOSYS)
                        ERROR("cannot list devices, is ib_uverbs loaded?");
                return -rte_errno;
        }
-       assert(i >= 0);
+       MLX4_ASSERT(i >= 0);
        /*
         * For each listed device, check related sysfs entry against
         * the provided PCI ID.
@@ -817,7 +819,7 @@ mlx4_pci_probe(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev)
                        ERROR("cannot use device, are drivers up to date?");
                        return -rte_errno;
                }
-               assert(err > 0);
+               MLX4_ASSERT(err > 0);
                rte_errno = err;
                return -rte_errno;
        }
@@ -842,7 +844,7 @@ mlx4_pci_probe(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev)
                err = ENODEV;
                goto error;
        }
-       assert(device_attr.max_sge >= MLX4_MAX_SGE);
+       MLX4_ASSERT(device_attr.max_sge >= MLX4_MAX_SGE);
        for (i = 0; i < device_attr.phys_port_cnt; i++) {
                uint32_t port = i + 1; /* ports are indexed from one */
                struct ibv_context *ctx = NULL;
@@ -1002,17 +1004,15 @@ mlx4_pci_probe(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev)
                     mac.addr_bytes[4], mac.addr_bytes[5]);
                /* Register MAC address. */
                priv->mac[0] = mac;
-#ifndef NDEBUG
-               {
-                       char ifname[IF_NAMESIZE];
-
-                       if (mlx4_get_ifname(priv, &ifname) == 0)
-                               DEBUG("port %u ifname is \"%s\"",
-                                     priv->port, ifname);
-                       else
-                               DEBUG("port %u ifname is unknown", priv->port);
+
+               if (mlx4_get_ifname(priv, &ifname) == 0) {
+                       DEBUG("port %u ifname is \"%s\"",
+                             priv->port, ifname);
+                       priv->if_index = if_nametoindex(ifname);
+               } else {
+                       DEBUG("port %u ifname is unknown", priv->port);
                }
-#endif
+
                /* Get actual MTU if possible. */
                mlx4_mtu_get(priv, &priv->mtu);
                DEBUG("port %u MTU is %u", priv->port, priv->mtu);
@@ -1301,15 +1301,15 @@ RTE_INIT(rte_mlx4_pmd_init)
 #ifdef RTE_IBVERBS_LINK_DLOPEN
        if (mlx4_glue_init())
                return;
-       assert(mlx4_glue);
+       MLX4_ASSERT(mlx4_glue);
 #endif
-#ifndef NDEBUG
+#ifdef RTE_LIBRTE_MLX4_DEBUG
        /* Glue structure must not contain any NULL pointers. */
        {
                unsigned int i;
 
                for (i = 0; i != sizeof(*mlx4_glue) / sizeof(void *); ++i)
-                       assert(((const void *const *)mlx4_glue)[i]);
+                       MLX4_ASSERT(((const void *const *)mlx4_glue)[i]);
        }
 #endif
        if (strcmp(mlx4_glue->version, MLX4_GLUE_VERSION)) {