net/mlx5: implement CQ for Rx using DevX API

[dpdk.git] / drivers / net / mlx5 / mlx5_vlan.c

diff --git a/drivers/net/mlx5/mlx5_vlan.c b/drivers/net/mlx5/mlx5_vlan.c
index f65e416..89983a4 100644 (file)
--- a/drivers/net/mlx5/mlx5_vlan.c
+++ b/drivers/net/mlx5/mlx5_vlan.c
@@ -8,23 +8,6 @@
 #include <stdint.h>
 #include <unistd.h>
 
-
-/*
- * Not needed by this file; included to work around the lack of off_t
- * definition for mlx5dv.h with unpatched rdma-core versions.
- */
-#include <sys/types.h>
-
-/* Verbs headers do not support -pedantic. */
-#ifdef PEDANTIC
-#pragma GCC diagnostic ignored "-Wpedantic"
-#endif
-#include <infiniband/mlx5dv.h>
-#include <infiniband/verbs.h>
-#ifdef PEDANTIC
-#pragma GCC diagnostic error "-Wpedantic"
-#endif
-
 #include <rte_ethdev_driver.h>
 #include <rte_common.h>
 #include <rte_malloc.h>
@@ -33,6 +16,7 @@
 #include <mlx5_glue.h>
 #include <mlx5_devx_cmds.h>
 #include <mlx5_nl.h>
+#include <mlx5_malloc.h>
 
 #include "mlx5.h"
 #include "mlx5_autoconf.h"
@@ -288,7 +272,8 @@ mlx5_vlan_vmwa_init(struct rte_eth_dev *dev, uint32_t ifindex)
                 */
                return NULL;
        }
-       vmwa = rte_zmalloc(__func__, sizeof(*vmwa), sizeof(uint32_t));
+       vmwa = mlx5_malloc(MLX5_MEM_ZERO, sizeof(*vmwa), sizeof(uint32_t),
+                          SOCKET_ID_ANY);
        if (!vmwa) {
                DRV_LOG(WARNING,
                        "Can not allocate memory"
@@ -300,7 +285,7 @@ mlx5_vlan_vmwa_init(struct rte_eth_dev *dev, uint32_t ifindex)
                DRV_LOG(WARNING,
                        "Can not create Netlink socket"
                        " for VLAN workaround context");
-               rte_free(vmwa);
+               mlx5_free(vmwa);
                return NULL;
        }
        vmwa->vf_ifindex = ifindex;
@@ -323,5 +308,5 @@ void mlx5_vlan_vmwa_exit(struct mlx5_nl_vlan_vmwa_context *vmwa)
        }
        if (vmwa->nl_socket >= 0)
                close(vmwa->nl_socket);
-       rte_free(vmwa);
+       mlx5_free(vmwa);
 }