Commit 714d0ffa authored Nov 09, 2019 by Vladimir Oltean Committed by David S. Miller Nov 11, 2019

net: mscc: ocelot: limit vlan ingress filtering to actual number of ports



The VSC7514 switch (Ocelot) is a 10-port device, while VSC9959 (Felix)
is 6-port. Therefore the VLAN filtering mask would be out of bounds when
calling for this new switch. Fix that.

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent c7282d38

drivers/net/ethernet/mscc/ocelot.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -389,7 +389,8 @@ static void ocelot_vlan_init(struct ocelot *ocelot)
		/* Set vlan ingress filter mask to all ports but the CPU port by
		* default.
		*/
		ocelot_write(ocelot, GENMASK(9, 0), ANA_VLANMASK);
		ocelot_write(ocelot, GENMASK(ocelot->num_phys_ports - 1, 0),
		ANA_VLANMASK);

		for (port = 0; port < ocelot->num_phys_ports; port++) {
		ocelot_write_gix(ocelot, 0, REW_PORT_VLAN_CFG, port);

Admin message