net/mlx5: fix build with clang 3.4.2

Compilation massage example:
"dpdk/drivers/net/mlx5/mlx5_flow_dv.c:1087:10: error: comparison of
unsigned enum expression < 0 is always false
[-Werror,-Wtautological-compare]
        if (reg < 0)
            ~~~ ^ ~
"

enum modify_reg holds only non-negative integers and in some places in
the code it was used to be compared with negative value, hence
compilation was failed.

Change all thus places to use integer instead of enum modify_reg.

Fixes: 3e8edd0ef848 ("net/mlx5: update metadata register ID query")
Fixes: 55deee1715f0 ("net/mlx5: extend flow mark support")
Cc: stable@dpdk.org
Signed-off-by: Matan Azrad <matan@mellanox.com>

diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
index 7738cb2499154e38846d254528a2869ba77a7bed..36bbb49dcb679c326302356771f301ea7cdd7f52 100644 (file)
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -341,7 +341,7 @@ static struct mlx5_flow_tunnel_info tunnels_info[] = {
  *   The request register on success, a negative errno
  *   value otherwise and rte_errno is set.
  */
-enum modify_reg
+int
 mlx5_flow_get_reg_id(struct rte_eth_dev *dev,
                     enum mlx5_feature_name feature,
                     uint32_t id,

diff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h
index f771cac42e1e8a60cfb5a2e8c90687a14cd75838..aaacf5c2557101989bafa017ea0d6e05f57b00b2 100644 (file)
--- a/drivers/net/mlx5/mlx5_flow.h
+++ b/drivers/net/mlx5/mlx5_flow.h
@@ -760,7 +760,7 @@ uint64_t mlx5_flow_hashfields_adjust(struct mlx5_flow *dev_flow, int tunnel,
                                     uint64_t hash_fields);
 uint32_t mlx5_flow_adjust_priority(struct rte_eth_dev *dev, int32_t priority,
                                   uint32_t subpriority);
-enum modify_reg mlx5_flow_get_reg_id(struct rte_eth_dev *dev,
+int mlx5_flow_get_reg_id(struct rte_eth_dev *dev,
                                     enum mlx5_feature_name feature,
                                     uint32_t id,
                                     struct rte_flow_error *error);

diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index 059d03f6f6f43529df6958d038e16d23b425af6a..fc156a348f391a695921cb833e31a9edf4005f63 100644 (file)
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -1077,7 +1077,7 @@ flow_dv_convert_action_mark(struct rte_eth_dev *dev,
                {4, 0, 0}, /* dynamic instead of MLX5_MODI_META_REG_C_1. */
                {0, 0, 0},
        };
-       enum modify_reg reg;
+       int reg;
 
        if (!mask)
                return rte_flow_error_set(error, EINVAL,
@@ -1119,7 +1119,7 @@ flow_dv_get_metadata_reg(struct rte_eth_dev *dev,
                         const struct rte_flow_attr *attr,
                         struct rte_flow_error *error)
 {
-       enum modify_reg reg =
+       int reg =
                mlx5_flow_get_reg_id(dev, attr->transfer ?
                                          MLX5_METADATA_FDB :
                                            attr->egress ?
@@ -1167,7 +1167,7 @@ flow_dv_convert_action_set_meta
        struct field_modify_info reg_c_x[] = {
                [1] = {0, 0, 0},
        };
-       enum modify_reg reg = flow_dv_get_metadata_reg(dev, attr, error);
+       int reg = flow_dv_get_metadata_reg(dev, attr, error);
 
        if (reg < 0)
                return reg;
@@ -1370,7 +1370,7 @@ flow_dv_validate_item_meta(struct rte_eth_dev *dev __rte_unused,
        struct rte_flow_item_meta nic_mask = {
                .data = UINT32_MAX
        };
-       enum modify_reg reg;
+       int reg;
        int ret;
 
        if (!spec)
@@ -2004,7 +2004,7 @@ flow_dv_validate_action_set_meta(struct rte_eth_dev *dev,
 {
        const struct rte_flow_action_set_meta *conf;
        uint32_t nic_mask = UINT32_MAX;
-       enum modify_reg reg;
+       int reg;
 
        if (!mlx5_flow_ext_mreg_supported(dev))
                return rte_flow_error_set(error, ENOTSUP,
@@ -6081,7 +6081,7 @@ flow_dv_translate_item_meta(struct rte_eth_dev *dev,
                meta_m = &rte_flow_item_meta_mask;
        meta_v = (const void *)item->spec;
        if (meta_v) {
-               enum modify_reg reg;
+               int reg;
                uint32_t value = meta_v->data;
                uint32_t mask = meta_m->data;