]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
net: mscc: ocelot: adjust maxlen on NPI port, not CPU
authorVladimir Oltean <vladimir.oltean@nxp.com>
Fri, 13 Mar 2020 13:46:51 +0000 (15:46 +0200)
committerDavid S. Miller <davem@davemloft.net>
Sun, 15 Mar 2020 07:16:40 +0000 (00:16 -0700)
commit4a601f109614929aee45e58ca3514ec93da070bb
tree4161ae73272d6a006acb9c53819080191a1dc785
parent746a1eda682cb7b5cd22f1b437da2121af64fbfe
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>
drivers/net/ethernet/mscc/ocelot.c