> -----Original Message----- > From: Dekel Peled <dek...@mellanox.com> > Sent: Wednesday, January 22, 2020 16:27 > To: Matan Azrad <ma...@mellanox.com>; Slava Ovsiienko > <viachesl...@mellanox.com> > Cc: Raslan Darawsheh <rasl...@mellanox.com>; Ori Kam > <or...@mellanox.com>; dev@dpdk.org; sta...@dpdk.org > Subject: [PATCH 02/11] net/mlx5: fix invalid check for VLAN actions > > Flow validation function includes, after all items and actions are validated > discretely, a check for VLAN and VXLAN actions. > This check is incorrect and redundant. > > This patch removes the invalid check from validation function. > Check is incorrect, action_flags bit map is checked against items mask > MLX5_FLOW_LAYER_TUNNEL. > Check is also redundant, because VLAN push/pop actions can be used > together with packet reformat actions. > > Fixes: b41e47da2592 ("net/mlx5: support pop flow action on VLAN header") > Cc: sta...@dpdk.org > > Signed-off-by: Dekel Peled <dek...@mellanox.com> > Acked-by: Ori Kam <or...@mellanox.com> Acked-by: Viacheslav Ovsiienko <viachesl...@mellanox.com>
> --- > drivers/net/mlx5/mlx5_flow_dv.c | 7 ------- > 1 file changed, 7 deletions(-) > > diff --git a/drivers/net/mlx5/mlx5_flow_dv.c > b/drivers/net/mlx5/mlx5_flow_dv.c index 5a1b426..afa3d0e 100644 > --- a/drivers/net/mlx5/mlx5_flow_dv.c > +++ b/drivers/net/mlx5/mlx5_flow_dv.c > @@ -5060,13 +5060,6 @@ struct field_modify_info modify_tcp[] = { > "action not supported"); > } > } > - if ((action_flags & MLX5_FLOW_LAYER_TUNNEL) && > - (action_flags & MLX5_FLOW_VLAN_ACTIONS)) > - return rte_flow_error_set(error, ENOTSUP, > - RTE_FLOW_ERROR_TYPE_ACTION, > - actions, > - "can't have vxlan and vlan" > - " actions in the same rule"); > /* Eswitch has few restrictions on using items and actions */ > if (attr->transfer) { > if (!mlx5_flow_ext_mreg_supported(dev) && > -- > 1.8.3.1