summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorIdo Schimmel <idosch@mellanox.com>2019-02-12 16:29:53 +0000
committerDavid S. Miller <davem@davemloft.net>2019-02-12 12:03:29 -0500
commit384c2f7473bc4f6b25f62060ab4d5985726bb12d (patch)
treece3537e093120ece1e9da4efc29cec67b878f058 /drivers
parent24f91ce0d27c535b3f91fc4e6627a3761db094c4 (diff)
downloadlinux-stable-384c2f7473bc4f6b25f62060ab4d5985726bb12d.tar.gz
linux-stable-384c2f7473bc4f6b25f62060ab4d5985726bb12d.tar.bz2
linux-stable-384c2f7473bc4f6b25f62060ab4d5985726bb12d.zip
mlxsw: spectrum_flower: Fix VLAN modify action support
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/ethernet/mellanox/mlxsw/spectrum_flower.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_flower.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_flower.c
index 9af9f5c1b25c..15f804453cd6 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_flower.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_flower.c
@@ -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;