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>

diff --git a/drivers/net/ethernet/mscc/ocelot.c b/drivers/net/ethernet/mscc/ocelot.c
index 58ead0652bce6afb166170ffc8e8cc7890f8f1df..107a07cfaec94c946eff4a4c25ee98b928a67c82 100644 (file)
--- a/drivers/net/ethernet/mscc/ocelot.c
+++ b/drivers/net/ethernet/mscc/ocelot.c
@@ -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);