116 lines
4.8 KiB
Diff
116 lines
4.8 KiB
Diff
From b46008ad0339b5ac38a1db24879b4e9304e368c1 Mon Sep 17 00:00:00 2001
|
|
From: Kamal Heib <kheib@redhat.com>
|
|
Date: Thu, 16 Apr 2026 18:03:19 -0400
|
|
Subject: [PATCH] net/mlx5: HWS, remove unused create_dest_array parameter
|
|
|
|
JIRA: https://redhat.atlassian.net/browse/RHEL-169055
|
|
|
|
commit 60afb51c89414b3d0061226415651f29a7eaf932
|
|
Author: Vlad Dogaru <vdogaru@nvidia.com>
|
|
Date: Thu Jul 3 21:54:22 2025 +0300
|
|
|
|
net/mlx5: HWS, remove unused create_dest_array parameter
|
|
|
|
`flow_source` is not used anywhere in mlx5hws_action_create_dest_array.
|
|
|
|
Signed-off-by: Vlad Dogaru <vdogaru@nvidia.com>
|
|
Signed-off-by: Yevgeny Kliteynik <kliteyn@nvidia.com>
|
|
Reviewed-by: Simon Horman <horms@kernel.org>
|
|
Signed-off-by: Mark Bloch <mbloch@nvidia.com>
|
|
Link: https://patch.msgid.link/20250703185431.445571-2-mbloch@nvidia.com
|
|
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|
|
|
Signed-off-by: Kamal Heib <kheib@redhat.com>
|
|
|
|
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/action.c b/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/action.c
|
|
index 447ea3f8722c..396804369b00 100644
|
|
--- a/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/action.c
|
|
+++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/action.c
|
|
@@ -1358,12 +1358,9 @@ mlx5hws_action_create_modify_header(struct mlx5hws_context *ctx,
|
|
}
|
|
|
|
struct mlx5hws_action *
|
|
-mlx5hws_action_create_dest_array(struct mlx5hws_context *ctx,
|
|
- size_t num_dest,
|
|
+mlx5hws_action_create_dest_array(struct mlx5hws_context *ctx, size_t num_dest,
|
|
struct mlx5hws_action_dest_attr *dests,
|
|
- bool ignore_flow_level,
|
|
- u32 flow_source,
|
|
- u32 flags)
|
|
+ bool ignore_flow_level, u32 flags)
|
|
{
|
|
struct mlx5hws_cmd_set_fte_dest *dest_list = NULL;
|
|
struct mlx5hws_cmd_ft_create_attr ft_attr = {0};
|
|
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/fs_hws.c b/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/fs_hws.c
|
|
index bf4643d0ce17..57592b92e24b 100644
|
|
--- a/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/fs_hws.c
|
|
+++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/fs_hws.c
|
|
@@ -571,14 +571,12 @@ static void mlx5_fs_put_dest_action_sampler(struct mlx5_fs_hws_context *fs_ctx,
|
|
static struct mlx5hws_action *
|
|
mlx5_fs_create_action_dest_array(struct mlx5hws_context *ctx,
|
|
struct mlx5hws_action_dest_attr *dests,
|
|
- u32 num_of_dests, bool ignore_flow_level,
|
|
- u32 flow_source)
|
|
+ u32 num_of_dests, bool ignore_flow_level)
|
|
{
|
|
u32 flags = MLX5HWS_ACTION_FLAG_HWS_FDB | MLX5HWS_ACTION_FLAG_SHARED;
|
|
|
|
return mlx5hws_action_create_dest_array(ctx, num_of_dests, dests,
|
|
- ignore_flow_level,
|
|
- flow_source, flags);
|
|
+ ignore_flow_level, flags);
|
|
}
|
|
|
|
static struct mlx5hws_action *
|
|
@@ -1015,7 +1013,6 @@ static int mlx5_fs_fte_get_hws_actions(struct mlx5_flow_root_namespace *ns,
|
|
}
|
|
(*ractions)[num_actions++].action = dest_actions->dest;
|
|
} else if (num_dest_actions > 1) {
|
|
- u32 flow_source = fte->act_dests.flow_context.flow_source;
|
|
bool ignore_flow_level;
|
|
|
|
if (num_actions == MLX5_FLOW_CONTEXT_ACTION_MAX ||
|
|
@@ -1025,10 +1022,10 @@ static int mlx5_fs_fte_get_hws_actions(struct mlx5_flow_root_namespace *ns,
|
|
}
|
|
ignore_flow_level =
|
|
!!(fte_action->flags & FLOW_ACT_IGNORE_FLOW_LEVEL);
|
|
- tmp_action = mlx5_fs_create_action_dest_array(ctx, dest_actions,
|
|
- num_dest_actions,
|
|
- ignore_flow_level,
|
|
- flow_source);
|
|
+ tmp_action =
|
|
+ mlx5_fs_create_action_dest_array(ctx, dest_actions,
|
|
+ num_dest_actions,
|
|
+ ignore_flow_level);
|
|
if (!tmp_action) {
|
|
err = -EOPNOTSUPP;
|
|
goto free_actions;
|
|
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/mlx5hws.h b/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/mlx5hws.h
|
|
index d8ac6c196211..a1295a311b70 100644
|
|
--- a/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/mlx5hws.h
|
|
+++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/mlx5hws.h
|
|
@@ -727,18 +727,14 @@ mlx5hws_action_create_push_vlan(struct mlx5hws_context *ctx, u32 flags);
|
|
* @dests: The destination array. Each contains a destination action and can
|
|
* have additional actions.
|
|
* @ignore_flow_level: Whether to turn on 'ignore_flow_level' for this dest.
|
|
- * @flow_source: Source port of the traffic for this actions.
|
|
* @flags: Action creation flags (enum mlx5hws_action_flags).
|
|
*
|
|
* Return: pointer to mlx5hws_action on success NULL otherwise.
|
|
*/
|
|
struct mlx5hws_action *
|
|
-mlx5hws_action_create_dest_array(struct mlx5hws_context *ctx,
|
|
- size_t num_dest,
|
|
+mlx5hws_action_create_dest_array(struct mlx5hws_context *ctx, size_t num_dest,
|
|
struct mlx5hws_action_dest_attr *dests,
|
|
- bool ignore_flow_level,
|
|
- u32 flow_source,
|
|
- u32 flags);
|
|
+ bool ignore_flow_level, u32 flags);
|
|
|
|
/**
|
|
* mlx5hws_action_create_insert_header - Create insert header action.
|
|
--
|
|
2.50.1 (Apple Git-155)
|
|
|