diff mbox series

[net-next,1/6] net/mlx5: Compare sampler flow destination ID in fs_core

Message ID 20210626074417.714833-2-saeed@kernel.org
State New
Headers show
Series mlx5 updates 2021-06-26 | expand

Commit Message

Saeed Mahameed June 26, 2021, 7:44 a.m. UTC 
From: Yevgeny Kliteynik <kliteyn@nvidia.com>

When comparing sampler flow destinations,
in fs_core, consider sampler ID as well.

Signed-off-by: Yevgeny Kliteynik <kliteyn@nvidia.com>
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>
---
 drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Comments

patchwork-bot+netdevbpf@kernel.org June 28, 2021, 9:20 p.m. UTC | #1 
Hello:

This series was applied to netdev/net-next.git (refs/heads/master):

On Sat, 26 Jun 2021 00:44:12 -0700 you wrote:
> From: Yevgeny Kliteynik <kliteyn@nvidia.com>

> 

> When comparing sampler flow destinations,

> in fs_core, consider sampler ID as well.

> 

> Signed-off-by: Yevgeny Kliteynik <kliteyn@nvidia.com>

> Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>

> 

> [...]


Here is the summary with links:
  - [net-next,1/6] net/mlx5: Compare sampler flow destination ID in fs_core
    https://git.kernel.org/netdev/net-next/c/6f8515568e69
  - [net-next,2/6] net/mlx5: DR, Add support for flow sampler offload
    https://git.kernel.org/netdev/net-next/c/1ab6dc35e914
  - [net-next,3/6] net/mlx5: Increase hairpin buffer size
    https://git.kernel.org/netdev/net-next/c/6cdc686aa316
  - [net-next,4/6] net/mlx5: SF, Improve performance in SF allocation
    https://git.kernel.org/netdev/net-next/c/5bd8cee2b9c5
  - [net-next,5/6] net/mlx5e: kTLS, Add stats for number of deleted kTLS TX offloaded connections
    https://git.kernel.org/netdev/net-next/c/e8c827614530
  - [net-next,6/6] net/mlx5e: Add IPsec support to uplink representor
    https://git.kernel.org/netdev/net-next/c/5589b8f1a2c7

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
diff mbox series

Patch

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
index b8617458a3fd..d7bf0a3e4a52 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
@@ -1504,7 +1504,9 @@  static bool mlx5_flow_dests_cmp(struct mlx5_flow_destination *d1,
 		    (d1->type == MLX5_FLOW_DESTINATION_TYPE_TIR &&
 		     d1->tir_num == d2->tir_num) ||
 		    (d1->type == MLX5_FLOW_DESTINATION_TYPE_FLOW_TABLE_NUM &&
-		     d1->ft_num == d2->ft_num))
+		     d1->ft_num == d2->ft_num) ||
+		    (d1->type == MLX5_FLOW_DESTINATION_TYPE_FLOW_SAMPLER &&
+		     d1->sampler_id == d2->sampler_id))
 			return true;
 	}