From patchwork Fri Dec 30 07:31:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Fietkau X-Patchwork-Id: 37602 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp2772324wrt; Thu, 29 Dec 2022 23:33:59 -0800 (PST) X-Google-Smtp-Source: AMrXdXuyIVN4Vg6Iv/QhvwiOZq0ikQcNJSTAml+AdfRv/SK8BHqKwzVO1zUAoDaG3unHf7lsXj2A X-Received: by 2002:a05:6402:538d:b0:487:2ce6:2b80 with SMTP id ew13-20020a056402538d00b004872ce62b80mr10066139edb.8.1672385639520; Thu, 29 Dec 2022 23:33:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672385639; cv=none; d=google.com; s=arc-20160816; b=LE/GsNSXAv9BFXMBKgD9Tjh+tZQfx94XzVjncE/XKcAvqpXckFLc5dZbxoCfe90Fug FTlb35G+m8tlSUDjuciMJ+bz4ZxTWSjEpWEXe0HsFrS0QIcvSjh/RJn73yyevEBZNVBM so6VeNLgcprl+kv55hs8Lo4VnRG0TRKhYe0CuHZhKpoDRzvAzbN4vK8Q5iNtAvPe97yc jhBFTB5Y7DhN+YHxkOgy8ABjUkLQcC4gAMzyVmKiKDm1XzXQ0fNtKGq7IGyAv0ugiGHQ tbIwNh/U3tww2qsf2+lXk+Lv/RFqnELiDjH4aTXQ69xPxe/IuXS7oKp7ll2OuXLWSp2g H1vg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=P13fC0gIy9H1wpJFlbhQImrQkU7AmQuWDjdNHiwtHhE=; b=Wsv3mA4sK7CfumlVqpBZkOd5fncOuv8jA35SvW9jbcNKeFUvAYgI56SysXYbXe1TAD KA0BUoSjvCY268bzdnmH60t65jH63XIfI3tuAyiPDs9NjGbZ8b87MK26DOLMIU0DC1Xn UGF24LDmsMTYTnuHFxzmrPJ5hcZuzYYQd+dmBBMzFp+LCgzVpRk/OTLbb38BwldcXy4g cB2Ym7ulMo/n1CVxdiMoAMwuErtWCqcIrgRfbWIUM+QbtdKJjyTgAbWknuWEh763Yubt QDDPpZex6M42TkyAOUotgaPehIgu8Qv/t5Tu38E3j35T7St15HjpDqLjAOXsQatXvd8W u5dg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@nbd.name header.s=20160729 header.b=AinItdjy; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nbd.name Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id u13-20020a056402064d00b00458ab55ccc9si16437329edx.168.2022.12.29.23.33.34; Thu, 29 Dec 2022 23:33:59 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=fail header.i=@nbd.name header.s=20160729 header.b=AinItdjy; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nbd.name Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234706AbiL3HcR (ORCPT + 99 others); Fri, 30 Dec 2022 02:32:17 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54080 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234573AbiL3HcG (ORCPT ); Fri, 30 Dec 2022 02:32:06 -0500 Received: from nbd.name (nbd.name [46.4.11.11]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F14112DF8; Thu, 29 Dec 2022 23:32:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=nbd.name; s=20160729; h=Content-Transfer-Encoding:MIME-Version:Message-Id:Date:Subject: Cc:To:From:Sender:Reply-To:Content-Type:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=P13fC0gIy9H1wpJFlbhQImrQkU7AmQuWDjdNHiwtHhE=; b=AinItdjyBiZbYhA1gF9YGn4UVW VxjwKYu0OviTHqSGApDH7OL35y6COZAeGsAEw6fl1Qnf3E/HCElLzHSBqVC693O6GP01Y5PtUJqAs osEYDCU6D/rk171ZGsWzM1M1TzPUZeSMdO91Vz1nsTDwVXMWzvgYPMTgC90xhmobBKAM=; Received: from p200300daa720fc00fd7bb9014adaf597.dip0.t-ipconnect.de ([2003:da:a720:fc00:fd7b:b901:4ada:f597] helo=Maecks.lan) by ds12 with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256 (Exim 4.94.2) (envelope-from ) id 1pB9rm-00CcyM-An; Fri, 30 Dec 2022 08:31:46 +0100 From: Felix Fietkau To: netdev@vger.kernel.org, John Crispin , Sean Wang , Mark Lee , Lorenzo Bianconi , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Matthias Brugger Cc: Vladimir Oltean , linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH net v3 1/5] net: ethernet: mtk_eth_soc: account for vlan in rx header length Date: Fri, 30 Dec 2022 08:31:41 +0100 Message-Id: <20221230073145.53386-1-nbd@nbd.name> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1753623444519909435?= X-GMAIL-MSGID: =?utf-8?q?1753623444519909435?= The network stack assumes that devices can handle an extra VLAN tag without increasing the MTU Reviewed-by: Vladimir Oltean Signed-off-by: Felix Fietkau --- drivers/net/ethernet/mediatek/mtk_eth_soc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.h b/drivers/net/ethernet/mediatek/mtk_eth_soc.h index 18a50529ce7b..877cee9bcc66 100644 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.h +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.h @@ -34,7 +34,7 @@ #define MTK_QDMA_RING_SIZE 2048 #define MTK_DMA_SIZE 512 #define MTK_MAC_COUNT 2 -#define MTK_RX_ETH_HLEN (ETH_HLEN + ETH_FCS_LEN) +#define MTK_RX_ETH_HLEN (VLAN_ETH_HLEN + ETH_FCS_LEN) #define MTK_RX_HLEN (NET_SKB_PAD + MTK_RX_ETH_HLEN + NET_IP_ALIGN) #define MTK_DMA_DUMMY_DESC 0xffffffff #define MTK_DEFAULT_MSG_ENABLE (NETIF_MSG_DRV | \