]> git.baikalelectronics.ru Git - kernel.git/commit
net: dsa: sja1105: fix checks for VLAN state in gate action
authorVladimir Oltean <vladimir.oltean@nxp.com>
Tue, 16 Jun 2020 23:58:43 +0000 (02:58 +0300)
committerDavid S. Miller <davem@davemloft.net>
Fri, 19 Jun 2020 03:20:46 +0000 (20:20 -0700)
commit336684eb06f2749870da177afa8f54203c0681e7
tree606c4c90925209bcf64ac77e88af250e5db97f18
parent1e64352868c0085f6a4eb537a5a414beedfbfc2d
net: dsa: sja1105: fix checks for VLAN state in gate 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: 83ed1d663245 ("net: dsa: sja1105: implement tc-gate using time-triggered 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