net/mlx5: add external Rx queue mapping API

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

diff --git a/drivers/net/mlx5/mlx5_flow_meter.c b/drivers/net/mlx5/mlx5_flow_meter.c
index 4f5de5e..06ab7c4 100644 (file)
--- a/drivers/net/mlx5/mlx5_flow_meter.c
+++ b/drivers/net/mlx5/mlx5_flow_meter.c
@@ -155,7 +155,7 @@ mlx5_flow_meter_profile_validate(struct rte_eth_dev *dev,
                                          "Meter profile already exists.");
        if (!priv->sh->meter_aso_en) {
                /* Old version is even not supported. */
-               if (!priv->config.hca_attr.qos.flow_meter_old)
+               if (!priv->sh->cdev->config.hca_attr.qos.flow_meter_old)
                        return -rte_mtr_error_set(error, ENOTSUP,
                                RTE_MTR_ERROR_TYPE_METER_PROFILE,
                                NULL, "Metering is not supported.");
@@ -428,7 +428,7 @@ mlx5_flow_mtr_cap_get(struct rte_eth_dev *dev,
                 struct rte_mtr_error *error __rte_unused)
 {
        struct mlx5_priv *priv = dev->data->dev_private;
-       struct mlx5_hca_qos_attr *qattr = &priv->config.hca_attr.qos;
+       struct mlx5_hca_qos_attr *qattr = &priv->sh->cdev->config.hca_attr.qos;
 
        if (!priv->mtr_en)
                return -rte_mtr_error_set(error, ENOTSUP,
@@ -658,8 +658,8 @@ mlx5_flow_meter_policy_validate(struct rte_eth_dev *dev,
        struct rte_mtr_error *error)
 {
        struct mlx5_priv *priv = dev->data->dev_private;
-       struct rte_flow_attr attr = { .transfer =
-                       priv->config.dv_esw_en ? 1 : 0};
+       struct rte_flow_attr attr = { .transfer = priv->sh->config.dv_esw_en ?
+                                                 1 : 0 };
        bool is_rss = false;
        uint8_t policy_mode;
        uint8_t domain_bitmap;
@@ -746,8 +746,8 @@ mlx5_flow_meter_policy_add(struct rte_eth_dev *dev,
                        struct rte_mtr_error *error)
 {
        struct mlx5_priv *priv = dev->data->dev_private;
-       struct rte_flow_attr attr = { .transfer =
-                       priv->config.dv_esw_en ? 1 : 0};
+       struct rte_flow_attr attr = { .transfer = priv->sh->config.dv_esw_en ?
+                                                 1 : 0 };
        uint32_t sub_policy_idx = 0;
        uint32_t policy_idx = 0;
        struct mlx5_flow_meter_policy *mtr_policy = NULL;
@@ -1213,7 +1213,7 @@ mlx5_flow_meter_create(struct rte_eth_dev *dev, uint32_t meter_id,
                        (&priv->sh->mtrmng->def_policy_ref_cnt,
                        1, __ATOMIC_RELAXED);
                domain_bitmap = MLX5_MTR_ALL_DOMAIN_BIT;
-               if (!priv->config.dv_esw_en)
+               if (!priv->sh->config.dv_esw_en)
                        domain_bitmap &= ~MLX5_MTR_DOMAIN_TRANSFER_BIT;
        } else {
                if (!priv->sh->meter_aso_en)
@@ -1726,7 +1726,7 @@ mlx5_flow_meter_stats_read(struct rte_eth_dev *dev,
        memset(stats, 0, sizeof(*stats));
        if (fm->drop_cnt) {
                ret = mlx5_counter_query(dev, fm->drop_cnt, clear, &pkts,
-                                                &bytes);
+                                                &bytes, NULL);
                if (ret)
                        goto error;
                /* If need to read the packets, set it. */