Message ID | 20191108100024.126857-1-alexander.sverdlin@nokia.com |
---|---|
State | Accepted |
Delegated to: | David Miller |
Headers | show |
Series | [v2] net: ethernet: octeon_mgmt: Account for second possible VLAN header | expand |
From: "Sverdlin, Alexander (Nokia - DE/Ulm)" <alexander.sverdlin@nokia.com> Date: Fri, 8 Nov 2019 10:00:44 +0000 > From: Alexander Sverdlin <alexander.sverdlin@nokia.com> > > Octeon's input ring-buffer entry has 14 bits-wide size field, so to account > for second possible VLAN header max_mtu must be further reduced. > > Fixes: 109cc16526c6d ("ethernet/cavium: use core min/max MTU checking") > Cc: stable@vger.kernel.org > Signed-off-by: Alexander Sverdlin <alexander.sverdlin@nokia.com> > --- > Changelog: > v2: Added "Fixes:" tag, Cc'ed stable Networking patches do not CC: stable, as per the Netdev FAQ
From: David Miller <davem@davemloft.net> Date: Fri, 08 Nov 2019 11:09:21 -0800 (PST) > From: "Sverdlin, Alexander (Nokia - DE/Ulm)" <alexander.sverdlin@nokia.com> > Date: Fri, 8 Nov 2019 10:00:44 +0000 > >> From: Alexander Sverdlin <alexander.sverdlin@nokia.com> >> >> Octeon's input ring-buffer entry has 14 bits-wide size field, so to account >> for second possible VLAN header max_mtu must be further reduced. >> >> Fixes: 109cc16526c6d ("ethernet/cavium: use core min/max MTU checking") >> Cc: stable@vger.kernel.org >> Signed-off-by: Alexander Sverdlin <alexander.sverdlin@nokia.com> >> --- >> Changelog: >> v2: Added "Fixes:" tag, Cc'ed stable > > Networking patches do not CC: stable, as per the Netdev FAQ Applied with stable CC: removed, and queued up for -stable, thanks.
diff --git a/drivers/net/ethernet/cavium/octeon/octeon_mgmt.c b/drivers/net/ethernet/cavium/octeon/octeon_mgmt.c index 0e5de88..cdd7e5d 100644 --- a/drivers/net/ethernet/cavium/octeon/octeon_mgmt.c +++ b/drivers/net/ethernet/cavium/octeon/octeon_mgmt.c @@ -1499,7 +1499,7 @@ static int octeon_mgmt_probe(struct platform_device *pdev) netdev->ethtool_ops = &octeon_mgmt_ethtool_ops; netdev->min_mtu = 64 - OCTEON_MGMT_RX_HEADROOM; - netdev->max_mtu = 16383 - OCTEON_MGMT_RX_HEADROOM; + netdev->max_mtu = 16383 - OCTEON_MGMT_RX_HEADROOM - VLAN_HLEN; mac = of_get_mac_address(pdev->dev.of_node);