net/mlx5: rename RxQ verbs to general RxQ object

[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 f6643fc..67518c2 100644 (file)
--- a/drivers/net/mlx5/mlx5_vlan.c
+++ b/drivers/net/mlx5/mlx5_vlan.c
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: BSD-3-Clause
  * Copyright 2015 6WIND S.A.
- * Copyright 2015 Mellanox.
+ * Copyright 2015 Mellanox Technologies, Ltd
  */
 
 #include <stddef.h>
@@ -8,6 +8,12 @@
 #include <assert.h>
 #include <stdint.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"
@@ -21,10 +27,11 @@
 #include <rte_ethdev_driver.h>
 #include <rte_common.h>
 
-#include "mlx5_utils.h"
 #include "mlx5.h"
 #include "mlx5_autoconf.h"
 #include "mlx5_glue.h"
+#include "mlx5_rxtx.h"
+#include "mlx5_utils.h"
 
 /**
  * DPDK callback to configure a VLAN filter.
@@ -42,11 +49,11 @@
 int
 mlx5_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on)
 {
-       struct priv *priv = dev->data->dev_private;
+       struct mlx5_priv *priv = dev->data->dev_private;
        unsigned int i;
 
-       DEBUG("port %u %s VLAN filter ID %" PRIu16,
-             dev->data->port_id, (on ? "enable" : "disable"), vlan_id);
+       DRV_LOG(DEBUG, "port %u %s VLAN filter ID %" PRIu16,
+               dev->data->port_id, (on ? "enable" : "disable"), vlan_id);
        assert(priv->vlan_filter_n <= RTE_DIM(priv->vlan_filter));
        for (i = 0; (i != priv->vlan_filter_n); ++i)
                if (priv->vlan_filter[i] == vlan_id)
@@ -96,7 +103,7 @@ out:
 void
 mlx5_vlan_strip_queue_set(struct rte_eth_dev *dev, uint16_t queue, int on)
 {
-       struct priv *priv = dev->data->dev_private;
+       struct mlx5_priv *priv = dev->data->dev_private;
        struct mlx5_rxq_data *rxq = (*priv->rxqs)[queue];
        struct mlx5_rxq_ctrl *rxq_ctrl =
                container_of(rxq, struct mlx5_rxq_ctrl, rxq);
@@ -108,19 +115,19 @@ mlx5_vlan_strip_queue_set(struct rte_eth_dev *dev, uint16_t queue, int on)
 
        /* Validate hw support */
        if (!priv->config.hw_vlan_strip) {
-               ERROR("port %u VLAN stripping is not supported",
-                     dev->data->port_id);
+               DRV_LOG(ERR, "port %u VLAN stripping is not supported",
+                       dev->data->port_id);
                return;
        }
        /* Validate queue number */
        if (queue >= priv->rxqs_n) {
-               ERROR("port %u VLAN stripping, invalid queue number %d",
-                     dev->data->port_id, queue);
+               DRV_LOG(ERR, "port %u VLAN stripping, invalid queue number %d",
+                       dev->data->port_id, queue);
                return;
        }
-       DEBUG("port %u set VLAN offloads 0x%x for port %uqueue %d",
-             dev->data->port_id, vlan_offloads, rxq->port_id, queue);
-       if (!rxq_ctrl->ibv) {
+       DRV_LOG(DEBUG, "port %u set VLAN offloads 0x%x for port %uqueue %d",
+               dev->data->port_id, vlan_offloads, rxq->port_id, queue);
+       if (!rxq_ctrl->obj) {
                /* Update related bits in RX queue. */
                rxq->vlan_strip = !!on;
                return;
@@ -130,10 +137,10 @@ mlx5_vlan_strip_queue_set(struct rte_eth_dev *dev, uint16_t queue, int on)
                .flags_mask = IBV_WQ_FLAGS_CVLAN_STRIPPING,
                .flags = vlan_offloads,
        };
-       ret = mlx5_glue->modify_wq(rxq_ctrl->ibv->wq, &mod);
+       ret = mlx5_glue->modify_wq(rxq_ctrl->obj->wq, &mod);
        if (ret) {
-               ERROR("port %u failed to modified stripping mode: %s",
-                     dev->data->port_id, strerror(rte_errno));
+               DRV_LOG(ERR, "port %u failed to modified stripping mode: %s",
+                       dev->data->port_id, strerror(rte_errno));
                return;
        }
        /* Update related bits in RX queue. */
@@ -154,7 +161,7 @@ mlx5_vlan_strip_queue_set(struct rte_eth_dev *dev, uint16_t queue, int on)
 int
 mlx5_vlan_offload_set(struct rte_eth_dev *dev, int mask)
 {
-       struct priv *priv = dev->data->dev_private;
+       struct mlx5_priv *priv = dev->data->dev_private;
        unsigned int i;
 
        if (mask & ETH_VLAN_STRIP_MASK) {
@@ -162,8 +169,8 @@ mlx5_vlan_offload_set(struct rte_eth_dev *dev, int mask)
                                       DEV_RX_OFFLOAD_VLAN_STRIP);
 
                if (!priv->config.hw_vlan_strip) {
-                       ERROR("port %u VLAN stripping is not supported",
-                             dev->data->port_id);
+                       DRV_LOG(ERR, "port %u VLAN stripping is not supported",
+                               dev->data->port_id);
                        return 0;
                }
                /* Run on every RX queue and set/reset VLAN stripping. */