]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
mlxsw: spectrum_flower: Fix VLAN modify action support
authorIdo Schimmel <idosch@mellanox.com>
Tue, 12 Feb 2019 16:29:53 +0000 (16:29 +0000)
committerDavid S. Miller <davem@davemloft.net>
Tue, 12 Feb 2019 17:03:29 +0000 (12:03 -0500)
The driver does not support VLAN push and pop, but only VLAN modify.

Fixes: 738678817573 ("drivers: net: use flow action infrastructure")
Signed-off-by: Ido Schimmel <idosch@mellanox.com>
Acked-by: Jiri Pirko <jiri@mellanox.com>
Cc: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/mellanox/mlxsw/spectrum_flower.c

index 9af9f5c1b25c237ca415d107cc544c9a2a49b764..15f804453cd614c8b6c7ff26a214b0a5c7f1ffdf 100644 (file)
@@ -102,8 +102,7 @@ static int mlxsw_sp_flower_parse_actions(struct mlxsw_sp *mlxsw_sp,
                                return err;
                        }
                        break;
-               case FLOW_ACTION_VLAN_PUSH:
-               case FLOW_ACTION_VLAN_POP: {
+               case FLOW_ACTION_VLAN_MANGLE: {
                        u16 proto = be16_to_cpu(act->vlan.proto);
                        u8 prio = act->vlan.prio;
                        u16 vid = act->vlan.vid;