OSDN Git Service

net/mlx5e: Remove wrong and superfluous tc pedit header type check
authorVlad Buslov <vladbu@mellanox.com>
Tue, 12 Feb 2019 17:45:16 +0000 (19:45 +0200)
committerSaeed Mahameed <saeedm@mellanox.com>
Tue, 19 Feb 2019 22:15:03 +0000 (14:15 -0800)
With recent introduction of flow_rule infrastructure drivers no longer
directly include action headers, so it is no longer possible to use
constants defined in them. Instead, one of flow_rule patches substituted
pedit action header constant with hardcoded value '2' in mlx5
set_pedit_val() function conditional which verifies that header type is in
range of values allowed by pedit action. That conditional is now both
wrong (hardcoded value is '2' but __PEDIT_HDR_TYPE_MAX is 6 in current
version) and superfluous (pedit action already verifies that header type is
in allowed range during init). Remove the described check from mlx5 code.

Fixes: 738678817573 ("drivers: net: use flow action infrastructure")
Signed-off-by: Vlad Buslov <vladbu@mellanox.com>
Reviewed-by: Roi Dayan <roid@mellanox.com>
Reviewed-by: Dmytro Linkin <dmitrolin@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c

index 05892fc..43b7191 100644 (file)
@@ -1827,9 +1827,6 @@ static int set_pedit_val(u8 hdr_type, u32 mask, u32 val, u32 offset,
 {
        u32 *curr_pmask, *curr_pval;
 
-       if (hdr_type >= 2)
-               goto out_err;
-
        curr_pmask = (u32 *)(pedit_header(&hdrs->masks, hdr_type) + offset);
        curr_pval  = (u32 *)(pedit_header(&hdrs->vals, hdr_type) + offset);