|
 |
d8f823 |
From c667484c074aea8fe652eeb7a9e5e24438436a69 Mon Sep 17 00:00:00 2001
|
|
|
d8f823 |
From: Alaa Hleihel <ahleihel@redhat.com>
|
|
|
d8f823 |
Date: Sun, 10 May 2020 14:52:41 -0400
|
|
|
d8f823 |
Subject: [PATCH 066/312] [netdrv] net/mlx5e: Remove incorrect match criteria
|
|
|
d8f823 |
assignment line
|
|
|
d8f823 |
|
|
|
d8f823 |
Message-id: <20200510145245.10054-79-ahleihel@redhat.com>
|
|
|
d8f823 |
Patchwork-id: 306620
|
|
|
d8f823 |
Patchwork-instance: patchwork
|
|
|
d8f823 |
O-Subject: [RHEL8.3 BZ 1789378 v2 78/82] net/mlx5e: Remove incorrect match criteria assignment line
|
|
|
d8f823 |
Bugzilla: 1789378
|
|
|
d8f823 |
RH-Acked-by: Kamal Heib <kheib@redhat.com>
|
|
|
d8f823 |
RH-Acked-by: Jarod Wilson <jarod@redhat.com>
|
|
|
d8f823 |
RH-Acked-by: Tony Camuso <tcamuso@redhat.com>
|
|
|
d8f823 |
RH-Acked-by: Jonathan Toppins <jtoppins@redhat.com>
|
|
|
d8f823 |
|
|
|
d8f823 |
Bugzilla: http://bugzilla.redhat.com/1789378
|
|
|
d8f823 |
Upstream: v5.4-rc6
|
|
|
d8f823 |
|
|
|
d8f823 |
commit 752d3dc06d6936d5a357a18b6b51d91c7e134e88
|
|
|
d8f823 |
Author: Dmytro Linkin <dmitrolin@mellanox.com>
|
|
|
d8f823 |
Date: Thu Aug 29 15:24:27 2019 +0000
|
|
|
d8f823 |
|
|
|
d8f823 |
net/mlx5e: Remove incorrect match criteria assignment line
|
|
|
d8f823 |
|
|
|
d8f823 |
Driver have function, which enable match criteria for misc parameters
|
|
|
d8f823 |
in dependence of eswitch capabilities.
|
|
|
d8f823 |
|
|
|
d8f823 |
Fixes: 4f5d1beadc10 ("Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux")
|
|
|
d8f823 |
Signed-off-by: Dmytro Linkin <dmitrolin@mellanox.com>
|
|
|
d8f823 |
Reviewed-by: Jianbo Liu <jianbol@mellanox.com>
|
|
|
d8f823 |
Reviewed-by: Roi Dayan <roid@mellanox.com>
|
|
|
d8f823 |
Reviewed-by: Saeed Mahameed <saeedm@mellanox.com>
|
|
|
d8f823 |
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
|
|
|
d8f823 |
|
|
|
d8f823 |
Signed-off-by: Alaa Hleihel <ahleihel@redhat.com>
|
|
|
d8f823 |
Signed-off-by: Frantisek Hrbata <fhrbata@redhat.com>
|
|
|
d8f823 |
---
|
|
|
d8f823 |
drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c | 1 -
|
|
|
d8f823 |
1 file changed, 1 deletion(-)
|
|
|
d8f823 |
|
|
|
d8f823 |
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
|
|
|
d8f823 |
index 93501e3c8b28..fa3249964ee9 100644
|
|
|
d8f823 |
--- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
|
|
|
d8f823 |
+++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
|
|
|
d8f823 |
@@ -285,7 +285,6 @@ mlx5_eswitch_add_fwd_rule(struct mlx5_eswitch *esw,
|
|
|
d8f823 |
|
|
|
d8f823 |
mlx5_eswitch_set_rule_source_port(esw, spec, attr);
|
|
|
d8f823 |
|
|
|
d8f823 |
- spec->match_criteria_enable |= MLX5_MATCH_MISC_PARAMETERS;
|
|
|
d8f823 |
if (attr->outer_match_level != MLX5_MATCH_NONE)
|
|
|
d8f823 |
spec->match_criteria_enable |= MLX5_MATCH_OUTER_HEADERS;
|
|
|
d8f823 |
|
|
|
d8f823 |
--
|
|
|
d8f823 |
2.13.6
|
|
|
d8f823 |
|