OSDN Git Service

net/mlx5: DR, Change matcher priority parameter type
authorHamdan Igbaria <hamdani@mellanox.com>
Mon, 17 Feb 2020 13:53:20 +0000 (15:53 +0200)
committerSaeed Mahameed <saeedm@mellanox.com>
Fri, 28 Feb 2020 00:40:23 +0000 (16:40 -0800)
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>
drivers/net/ethernet/mellanox/mlx5/core/steering/dr_matcher.c
drivers/net/ethernet/mellanox/mlx5/core/steering/dr_types.h
drivers/net/ethernet/mellanox/mlx5/core/steering/fs_dr.c
drivers/net/ethernet/mellanox/mlx5/core/steering/mlx5dr.h

index c6dbd85..2ecec44 100644 (file)
@@ -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)
 {
index dffe351..3fa7399 100644 (file)
@@ -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;
index c202719..d12d3a2 100644 (file)
@@ -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,
index e1edc9c..e09e4ea 100644 (file)
@@ -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; }