diff options
| author |   Vladimir Oltean <vladimir.oltean@nxp.com> | 2019-11-09 15:02:55 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2019-11-11 12:59:10 -0800 |
| commit | 714d0ffabeb21550895ff32a8ba8866b684b5203 (patch) | |
| tree | 6a613cac155e9088103eb2f0595289cb0ff6b230 /drivers/net/ethernet/mscc | |
| parent | net: mscc: ocelot: refactor ethtool callbacks (diff) | |
| download | linux-dev-714d0ffabeb21550895ff32a8ba8866b684b5203.tar.xz linux-dev-714d0ffabeb21550895ff32a8ba8866b684b5203.zip | |
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>
Diffstat (limited to 'drivers/net/ethernet/mscc')
| -rw-r--r-- | drivers/net/ethernet/mscc/ocelot.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethernet/mscc/ocelot.c b/drivers/net/ethernet/mscc/ocelot.c index 58ead0652bce..107a07cfaec9 100644 --- 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); |