Commit 96de67a7 authored by Or Gerlitz's avatar Or Gerlitz Committed by Saeed Mahameed
Browse files

net/mlx5: Add header re-write to the checks for conflicting actions 



We can't allow only some of the rules sharing an FTE to ask for
header re-write, add it to the conflicting action checks.

Fixes: 0d235c3f ('net/mlx5: Add hash table to search FTEs in a flow-group')
Signed-off-by: default avatarOr Gerlitz <ogerlitz@mellanox.com>
Reviewed-by: default avatarMatan Barak <matanb@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
parent c67f100e

drivers/net/ethernet/mellanox/mlx5/core/fs_core.c

+2 −1
Original line number Diff line number Diff line
@@ -1429,7 +1429,8 @@ static bool check_conflicting_actions(u32 action1, u32 action2) 


	if (xored_actions & (MLX5_FLOW_CONTEXT_ACTION_DROP  |

			     MLX5_FLOW_CONTEXT_ACTION_ENCAP |

			     MLX5_FLOW_CONTEXT_ACTION_DECAP))

			     MLX5_FLOW_CONTEXT_ACTION_DECAP |

			     MLX5_FLOW_CONTEXT_ACTION_MOD_HDR))

		return true;



	return false;