diff options
| author | Vladimir Oltean <vladimir.oltean@nxp.com> | 2020-03-13 15:46:51 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-03-15 00:16:40 -0700 |
| commit | 4a601f109614929aee45e58ca3514ec93da070bb (patch) | |
| tree | 4161ae73272d6a006acb9c53819080191a1dc785 /drivers/net/ethernet | |
| parent | 746a1eda682cb7b5cd22f1b437da2121af64fbfe (diff) | |
net: mscc: ocelot: adjust maxlen on NPI port, not CPU
Being a non-physical port, the CPU port does not have an ocelot_port
structure, so the ocelot_port_writel call inside the
ocelot_port_set_maxlen() function would access data behind a NULL
pointer.
This is a patch for net-next only, the net tree boots fine, the bug was
introduced during the net -> net-next merge.
Fixes: 1d3435793123 ("Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net")
Fixes: a8015ded89ad ("net: mscc: ocelot: properly account for VLAN header length when setting MRU")
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet')
| -rw-r--r-- | drivers/net/ethernet/mscc/ocelot.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/mscc/ocelot.c b/drivers/net/ethernet/mscc/ocelot.c index 18e9ffa21cd4..dc0e27328661 100644 --- a/drivers/net/ethernet/mscc/ocelot.c +++ b/drivers/net/ethernet/mscc/ocelot.c @@ -2341,7 +2341,7 @@ void ocelot_configure_cpu(struct ocelot *ocelot, int npi, else if (injection == OCELOT_TAG_PREFIX_LONG) sdu += OCELOT_LONG_PREFIX_LEN; - ocelot_port_set_maxlen(ocelot, cpu, sdu); + ocelot_port_set_maxlen(ocelot, npi, sdu); /* Enable NPI port */ ocelot_write_rix(ocelot, |