Hi Dekel, On 15/08/2019 10:26, Dekel Peled wrote: > Function mlx5_flow_validate_action_drop() checks if another fate > action is already present in this flow rule, using > defined value MLX5_FLOW_FATE_ACTIONS. > This patch enhances the check using value > (MLX5_FLOW_FATE_ACTIONS | MLX5_FLOW_FATE_ESWITCH_ACTIONS) > to make sure all relevant fate actions are checked. > > Fixes: 23c1d42c7138 ("net/mlx5: split flow validation to dedicated function")
MLX5_FLOW_FATE_ESWITCH_ACTIONS is not available and causes build error for 18.11. I think correct fixes tag is, Fixes: 2e4c987aad91 ("net/mlx5: validate Direct Rule E-Switch") which is not part of 18.11 stable. Will drop patch from 18.11 stable. Let me know if there is something else needed. thanks, Kevin. > Cc: sta...@dpdk.org > > Signed-off-by: Dekel Peled <dek...@mellanox.com> > --- > drivers/net/mlx5/mlx5_flow.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c > index 9d2c8c9..2356c14 100644 > --- a/drivers/net/mlx5/mlx5_flow.c > +++ b/drivers/net/mlx5/mlx5_flow.c > @@ -809,7 +809,8 @@ uint32_t mlx5_flow_adjust_priority(struct rte_eth_dev > *dev, int32_t priority, > return rte_flow_error_set(error, EINVAL, > RTE_FLOW_ERROR_TYPE_ACTION, NULL, > "can't drop and mark in same flow"); > - if (action_flags & MLX5_FLOW_FATE_ACTIONS) > + if (action_flags & (MLX5_FLOW_FATE_ACTIONS | > + MLX5_FLOW_FATE_ESWITCH_ACTIONS)) > return rte_flow_error_set(error, EINVAL, > RTE_FLOW_ERROR_TYPE_ACTION, NULL, > "can't have 2 fate actions in" >