net/mlx5: DR, Change matcher priority parameter type

Change matcher priority parameter type from u16 to u32,
this change is needed since sometimes upper levels
create a matcher with priority bigger than 2^16.

Signed-off-by: Hamdan Igbaria <hamdani@mellanox.com>
Reviewed-by: Alex Vesker <valex@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_matcher.c b/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_matcher.c
index c6dbd856df942ad4b852cfbb9c4886a8ffb79580..2ecec4429070f221711ba0268a679611618badf0 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_matcher.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_matcher.c
@@ -671,7 +671,7 @@ static int dr_matcher_init(struct mlx5dr_matcher *matcher,
 
 struct mlx5dr_matcher *
 mlx5dr_matcher_create(struct mlx5dr_table *tbl,
-                     u16 priority,
+                     u32 priority,
                      u8 match_criteria_enable,
                      struct mlx5dr_match_parameters *mask)
 {

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_types.h b/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_types.h
index dffe35145d1921bccc4fbc48bb3261cfdcac9e80..3fa739951b34ca681fd9f4c2483259e77c5fd2c0 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_types.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_types.h
@@ -705,7 +705,7 @@ struct mlx5dr_matcher {
        struct mlx5dr_matcher_rx_tx rx;
        struct mlx5dr_matcher_rx_tx tx;
        struct list_head matcher_list;
-       u16 prio;
+       u32 prio;
        struct mlx5dr_match_param mask;
        u8 match_criteria;
        refcount_t refcount;

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/fs_dr.c b/drivers/net/ethernet/mellanox/mlx5/core/steering/fs_dr.c
index c2027192e21e8c8a298e915e161ea592d17b83f6..d12d3a2d46abaa8dbb88d73d5be6c68e40c06a57 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/steering/fs_dr.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/fs_dr.c
@@ -140,7 +140,7 @@ static int mlx5_cmd_dr_create_flow_group(struct mlx5_flow_root_namespace *ns,
                                         struct mlx5_flow_group *fg)
 {
        struct mlx5dr_matcher *matcher;
-       u16 priority = MLX5_GET(create_flow_group_in, in,
+       u32 priority = MLX5_GET(create_flow_group_in, in,
                                start_flow_index);
        u8 match_criteria_enable = MLX5_GET(create_flow_group_in,
                                            in,

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/mlx5dr.h b/drivers/net/ethernet/mellanox/mlx5/core/steering/mlx5dr.h
index e1edc9c247b75c1941ac55170890aa7ce98a4161..e09e4ea1b04551115f111a9e65db378c2af0f89a 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/steering/mlx5dr.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/mlx5dr.h
@@ -59,7 +59,7 @@ u32 mlx5dr_table_get_id(struct mlx5dr_table *table);
 
 struct mlx5dr_matcher *
 mlx5dr_matcher_create(struct mlx5dr_table *table,
-                     u16 priority,
+                     u32 priority,
                      u8 match_criteria_enable,
                      struct mlx5dr_match_parameters *mask);
 
@@ -151,7 +151,7 @@ mlx5dr_table_get_id(struct mlx5dr_table *table) { return 0; }
 
 static inline struct mlx5dr_matcher *
 mlx5dr_matcher_create(struct mlx5dr_table *table,
-                     u16 priority,
+                     u32 priority,
                      u8 match_criteria_enable,
                      struct mlx5dr_match_parameters *mask) { return NULL; }