Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

net: dsa: felix: accept VLAN config regardless of bridge VLAN awareness state

The ocelot core library is written with the idea in mind that the VLAN
table is populated by the bridge. Otherwise, not even a sane default
pvid is provided: in standalone mode, the default pvid is 0, and the
core expects the bridge layer to change it to 1.

So without this patch, the VLAN table is completely empty at the end of
the commands below, and traffic is broken as a result:

ip link add dev br0 type bridge vlan_filtering 0 && ip link set dev br0 up
for eth in $(ls /sys/bus/pci/devices/0000\:00\:00.5/net/); do
ip link set dev $eth master br0
ip link set dev $eth up
done
ip link set dev br0 type bridge vlan_filtering 1

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Vladimir Oltean and committed by
David S. Miller
626a8323 5a1b72ce

+1
+1
drivers/net/dsa/ocelot/felix.c
··· 594 594 ANA_FLOODING, tc); 595 595 596 596 ds->mtu_enforcement_ingress = true; 597 + ds->configure_vlan_while_not_filtering = true; 597 598 /* It looks like the MAC/PCS interrupt register - PM0_IEVENT (0x8040) 598 599 * isn't instantiated for the Felix PF. 599 600 * In-band AN may take a few ms to complete, so we need to poll.