]> git.baikalelectronics.ru Git - kernel.git/commit
net: dsa: sja1105: fix checks for VLAN state in redirect action
authorVladimir Oltean <vladimir.oltean@nxp.com>
Tue, 16 Jun 2020 23:58:42 +0000 (02:58 +0300)
committerDavid S. Miller <davem@davemloft.net>
Fri, 19 Jun 2020 03:20:46 +0000 (20:20 -0700)
commit048885dbaf4ba04ba5101546e30c40a024a6311e
tree0305cbd75ab8f78bd193c388a15fbb0c72efb427
parent36cd61b3c260e31cba51163ed979ea93a15dc885
net: dsa: sja1105: fix checks for VLAN state in redirect action

This action requires the VLAN awareness state of the switch to be of the
same type as the key that's being added:

- If the switch is unaware of VLAN, then the tc filter key must only
  contain the destination MAC address.
- If the switch is VLAN-aware, the key must also contain the VLAN ID and
  PCP.

But this check doesn't work unless we verify the VLAN awareness state on
both the "if" and the "else" branches.

Fixes: 24c5c09fa7ab ("net: dsa: sja1105: support flow-based redirection via virtual links")
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/dsa/sja1105/sja1105_vl.c