Jiri Slaby e4c1b7
From: Alexander Sverdlin <alexander.sverdlin@nokia.com>
Jiri Slaby e4c1b7
Date: Fri, 8 Nov 2019 10:00:44 +0000
Jiri Slaby e4c1b7
Subject: net: ethernet: octeon_mgmt: Account for second possible VLAN header
Jiri Slaby e4c1b7
Git-commit: e4dd5608033efe7b6030cde359bfdbaeb73bc22d
Jiri Slaby e4c1b7
Patch-mainline: 5.4-rc7
Jiri Slaby e4c1b7
References: networking-stable-19_11_10
Jiri Slaby e4c1b7
Jiri Slaby e4c1b7
Octeon's input ring-buffer entry has 14 bits-wide size field, so to account
Jiri Slaby e4c1b7
for second possible VLAN header max_mtu must be further reduced.
Jiri Slaby e4c1b7
Jiri Slaby e4c1b7
Fixes: 109cc16526c6d ("ethernet/cavium: use core min/max MTU checking")
Jiri Slaby e4c1b7
Signed-off-by: Alexander Sverdlin <alexander.sverdlin@nokia.com>
Jiri Slaby e4c1b7
Signed-off-by: David S. Miller <davem@davemloft.net>
Jiri Slaby e4c1b7
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Jiri Slaby e4c1b7
---
Jiri Slaby e4c1b7
 drivers/net/ethernet/cavium/octeon/octeon_mgmt.c |    2 +-
Jiri Slaby e4c1b7
 1 file changed, 1 insertion(+), 1 deletion(-)
Jiri Slaby e4c1b7
Jiri Slaby e4c1b7
--- a/drivers/net/ethernet/cavium/octeon/octeon_mgmt.c
Jiri Slaby e4c1b7
+++ b/drivers/net/ethernet/cavium/octeon/octeon_mgmt.c
Jiri Slaby e4c1b7
@@ -1497,7 +1497,7 @@ static int octeon_mgmt_probe(struct plat
Jiri Slaby e4c1b7
 	netdev->ethtool_ops = &octeon_mgmt_ethtool_ops;
Jiri Slaby e4c1b7
 
Jiri Slaby e4c1b7
 	netdev->min_mtu = 64 - OCTEON_MGMT_RX_HEADROOM;
Jiri Slaby e4c1b7
-	netdev->max_mtu = 16383 - OCTEON_MGMT_RX_HEADROOM;
Jiri Slaby e4c1b7
+	netdev->max_mtu = 16383 - OCTEON_MGMT_RX_HEADROOM - VLAN_HLEN;
Jiri Slaby e4c1b7
 
Jiri Slaby e4c1b7
 	mac = of_get_mac_address(pdev->dev.of_node);
Jiri Slaby e4c1b7