You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
80 lines
2.8 KiB
80 lines
2.8 KiB
From fbd9f760e024d696d1cc7518e36a22cf7c190513 Mon Sep 17 00:00:00 2001
|
|
From: Alaa Hleihel <ahleihel@redhat.com>
|
|
Date: Tue, 12 May 2020 10:55:10 -0400
|
|
Subject: [PATCH 194/312] [netdrv] net/mlx5e: Remove unused argument from
|
|
parse_tc_pedit_action()
|
|
|
|
Message-id: <20200512105530.4207-105-ahleihel@redhat.com>
|
|
Patchwork-id: 306976
|
|
Patchwork-instance: patchwork
|
|
O-Subject: [RHEL8.3 BZ 1789382 104/124] net/mlx5e: Remove unused argument from parse_tc_pedit_action()
|
|
Bugzilla: 1789382
|
|
RH-Acked-by: Tony Camuso <tcamuso@redhat.com>
|
|
RH-Acked-by: Kamal Heib <kheib@redhat.com>
|
|
RH-Acked-by: Jarod Wilson <jarod@redhat.com>
|
|
|
|
Bugzilla: http://bugzilla.redhat.com/1789382
|
|
Upstream: v5.7-rc1
|
|
|
|
commit dec481c86e741b9ec94cb7867dbf253d6bca5e43
|
|
Author: Eli Cohen <eli@mellanox.com>
|
|
Date: Thu Feb 13 15:18:51 2020 +0200
|
|
|
|
net/mlx5e: Remove unused argument from parse_tc_pedit_action()
|
|
|
|
parse_attr is not used by parse_tc_pedit_action() so revmove it.
|
|
|
|
Signed-off-by: Eli Cohen <eli@mellanox.com>
|
|
Reviewed-by: Roi Dayan <roid@mellanox.com>
|
|
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
|
|
|
|
Signed-off-by: Alaa Hleihel <ahleihel@redhat.com>
|
|
Signed-off-by: Frantisek Hrbata <fhrbata@redhat.com>
|
|
---
|
|
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 8 +++-----
|
|
1 file changed, 3 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
|
|
index 2fc1a0879e5d..284a1df33bc7 100644
|
|
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
|
|
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
|
|
@@ -2548,7 +2548,6 @@ static const struct pedit_headers zero_masks = {};
|
|
|
|
static int parse_tc_pedit_action(struct mlx5e_priv *priv,
|
|
const struct flow_action_entry *act, int namespace,
|
|
- struct mlx5e_tc_flow_parse_attr *parse_attr,
|
|
struct pedit_headers_action *hdrs,
|
|
struct netlink_ext_ack *extack)
|
|
{
|
|
@@ -2824,8 +2823,7 @@ static int add_vlan_rewrite_action(struct mlx5e_priv *priv, int namespace,
|
|
return -EOPNOTSUPP;
|
|
}
|
|
|
|
- err = parse_tc_pedit_action(priv, &pedit_act, namespace, parse_attr,
|
|
- hdrs, NULL);
|
|
+ err = parse_tc_pedit_action(priv, &pedit_act, namespace, hdrs, NULL);
|
|
*action |= MLX5_FLOW_CONTEXT_ACTION_MOD_HDR;
|
|
|
|
return err;
|
|
@@ -2887,7 +2885,7 @@ static int parse_tc_nic_actions(struct mlx5e_priv *priv,
|
|
case FLOW_ACTION_MANGLE:
|
|
case FLOW_ACTION_ADD:
|
|
err = parse_tc_pedit_action(priv, act, MLX5_FLOW_NAMESPACE_KERNEL,
|
|
- parse_attr, hdrs, extack);
|
|
+ hdrs, extack);
|
|
if (err)
|
|
return err;
|
|
|
|
@@ -3330,7 +3328,7 @@ static int parse_tc_fdb_actions(struct mlx5e_priv *priv,
|
|
case FLOW_ACTION_MANGLE:
|
|
case FLOW_ACTION_ADD:
|
|
err = parse_tc_pedit_action(priv, act, MLX5_FLOW_NAMESPACE_FDB,
|
|
- parse_attr, hdrs, extack);
|
|
+ hdrs, extack);
|
|
if (err)
|
|
return err;
|
|
|
|
--
|
|
2.13.6
|
|
|