Skip to content

Commit

Permalink
net: dsa: mv88e6xxx: fix vlan setup
Browse files Browse the repository at this point in the history
DSA assumes that a bridge which has vlan filtering disabled is not
vlan aware, and ignores all vlan configuration. However, the kernel
software bridge code allows configuration in this state.

This causes the kernel's idea of the bridge vlan state and the
hardware state to disagree, so "bridge vlan show" indicates a correct
configuration but the hardware lacks all configuration. Even worse,
enabling vlan filtering on a DSA bridge immediately blocks all traffic
which, given the output of "bridge vlan show", is very confusing.

Allow the VLAN configuration to be updated on Marvell DSA bridges,
otherwise we end up cutting all traffic when enabling vlan filtering.

Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Tested-by: Vladimir Oltean <olteanv@gmail.com>
Link: https://lore.kernel.org/r/E1kYAU3-00071C-1G@rmk-PC.armlinux.org.uk
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  • Loading branch information
Russell King authored and Jakub Kicinski committed Oct 30, 2020
1 parent 85bec4b commit 1fb7419
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions drivers/net/dsa/mv88e6xxx/chip.c
Original file line number Diff line number Diff line change
Expand Up @@ -2851,6 +2851,7 @@ static int mv88e6xxx_setup(struct dsa_switch *ds)

chip->ds = ds;
ds->slave_mii_bus = mv88e6xxx_default_mdio_bus(chip);
ds->configure_vlan_while_not_filtering = true;

mv88e6xxx_reg_lock(chip);

Expand Down

0 comments on commit 1fb7419

Please sign in to comment.