From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 50669C43331 for ; Mon, 11 Nov 2019 18:36:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 19FE8214E0 for ; Mon, 11 Nov 2019 18:36:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573497402; bh=hMRhwn6a2PNFdU9J61hyqIu9H40kpYXBCYyEwjl7EGM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=YNDOdAEZ0rtRonsRE7aqyq2US90tEkrvMCf3P7hu0FGIGh+PEkIdSjvcQJOb+YCPX 5VvuGPAK2/YcGihWYoEj7DujcJ6o5RvFXfdkvdndTM5+EfAdgsNM8sWZk+axUqesA2 eryfRUOj/qX0mWCcYgOjoPEUDlx7g/iLHi9QTX/M= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727016AbfKKSgl (ORCPT ); Mon, 11 Nov 2019 13:36:41 -0500 Received: from mail.kernel.org ([198.145.29.99]:55032 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727634AbfKKSgi (ORCPT ); Mon, 11 Nov 2019 13:36:38 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 85BC0214E0; Mon, 11 Nov 2019 18:36:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573497398; bh=hMRhwn6a2PNFdU9J61hyqIu9H40kpYXBCYyEwjl7EGM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mrJP7NtZez24e3y7OdntrhWfNapbA38kxf621AaQABOnYId3XLqH9/c08AaCJUozk eKXkbwmhiIo6WaIT3RcIVLKLFQPsP++F1o0NSj7l5Ty26lzRGXqvHlSclb2l2alrIR AaV6YHbBLHPl8PIq1eCg6T5a/gJzKrC29uMlZ0YQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Alexander Sverdlin , "David S. Miller" Subject: [PATCH 4.14 004/105] net: ethernet: octeon_mgmt: Account for second possible VLAN header Date: Mon, 11 Nov 2019 19:27:34 +0100 Message-Id: <20191111181423.465740837@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191111181421.390326245@linuxfoundation.org> References: <20191111181421.390326245@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Alexander Sverdlin [ Upstream commit e4dd5608033efe7b6030cde359bfdbaeb73bc22d ] 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") Signed-off-by: Alexander Sverdlin Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/cavium/octeon/octeon_mgmt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/net/ethernet/cavium/octeon/octeon_mgmt.c +++ b/drivers/net/ethernet/cavium/octeon/octeon_mgmt.c @@ -1497,7 +1497,7 @@ static int octeon_mgmt_probe(struct plat 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);