From patchwork Wed Nov 9 16:34:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Fietkau X-Patchwork-Id: 17675 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp440640wru; Wed, 9 Nov 2022 08:42:19 -0800 (PST) X-Google-Smtp-Source: AMsMyM5p8s2SgcttXU6nvvql3ePCrCMDgyABMBtQvwKBCYuQ5IGzxLEgPu2Ac5s6L9WOW9+rraeO X-Received: by 2002:a63:3182:0:b0:46f:ed32:54a6 with SMTP id x124-20020a633182000000b0046fed3254a6mr37830912pgx.69.1668012139509; Wed, 09 Nov 2022 08:42:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668012139; cv=none; d=google.com; s=arc-20160816; b=VYJ+/mxHM12m4NLDqO6r2WNUI9GED9Gz32bGa/lEEZOuEYM6gQp92QR80COaCX7Uum Rb9qlVR5CXqs7U6DFpxvlEDrzL8KvKPB2DvbN+RFvuJ7J45dSljaElb3CcKowNJ3Kpg/ htt+lakiAp3dltOLQDs/xO8WgOtBcUUGyVz6+Oqw9ySJNPiMdZHrdVDvdKPZOqN3Uf0K g2SJw0d9SUDmci5pVvOLcRZhBcPHLEh7YuA5nTRZJKtxy+E7INSzs9EeLNuhdUWHdqcV TVhi+Z7qASHUm7y2d1hCIVc6hTMwKAuwaTEHeUmJXxD1RalLI2b3HHXgGyPQfABFpyJw EEgg== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=W2E4Ms9uc9J9Ds/fMfsOB8+k0By+V4+l9wVONX22uWE=; b=WRxryqW8p85ZX+ngPtIMsfHjZIRKPUUegPZtYd7tH9GedtKaxffZBZ/GS0DUZJSxar Mz1dMQM+q7hQN1kECQBUn3yBNfgNw5gNLFZmWuYeswO7BrL6paWNPLxMcfWbltfYpNJZ t3LVEr190iSq2XSRvz6FBHnuwcoD+7gp1TdHJdBAcyR43eUGZ0JxAHfqSpsBSvvJaqQf kVdwoDKhP8EusUf0RwsABAKHa9ue+yqQimq+QaRuls6Ifn1cTpm1dSlrrCR0cBwAT4di Dhuy6W4irJvF3doxaxOiHuatJ4kbovQ3BGwqi+5DXUSiBMIVeQKQWW6oVaC/TRdDVMCX UYuA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@nbd.name header.s=20160729 header.b=pA8lzr+r; 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 c11-20020a65674b000000b0041b577f3356si19334207pgu.720.2022.11.09.08.42.05; Wed, 09 Nov 2022 08:42:19 -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=pA8lzr+r; 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 S231787AbiKIQfI (ORCPT + 99 others); Wed, 9 Nov 2022 11:35:08 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42010 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229995AbiKIQew (ORCPT ); Wed, 9 Nov 2022 11:34:52 -0500 Received: from nbd.name (nbd.name [46.4.11.11]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5530A1A06F; Wed, 9 Nov 2022 08:34:52 -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:References:In-Reply-To: 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:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=W2E4Ms9uc9J9Ds/fMfsOB8+k0By+V4+l9wVONX22uWE=; b=pA8lzr+rM2UmcM0MV2wVv0Kw4C fyf9BHbCCg2RLB0h0MPAXyJR70KaGvc28usii6aQo4415C3/S/LcHMO0L+SEQTSbO/+RpvrrbfScD 0ydNos+7lUENHNS+21V+Mo82l7pniop4A4kl9lVI/WJUN/LNmCs88s8AwHc6XYSAr8b8=; Received: from p200300daa72ee100054f3c61b16ef6e7.dip0.t-ipconnect.de ([2003:da:a72e:e100:54f:3c61:b16e:f6e7] helo=localhost.localdomain) by ds12 with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256 (Exim 4.94.2) (envelope-from ) id 1oso23-000l4N-2z; Wed, 09 Nov 2022 17:34:31 +0100 From: Felix Fietkau To: netdev@vger.kernel.org, John Crispin , Sean Wang , Mark Lee , "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-next v2 01/12] net: ethernet: mtk_eth_soc: account for vlan in rx header length Date: Wed, 9 Nov 2022 17:34:15 +0100 Message-Id: <20221109163426.76164-2-nbd@nbd.name> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221109163426.76164-1-nbd@nbd.name> References: <20221109163426.76164-1-nbd@nbd.name> 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?1749037496782968023?= X-GMAIL-MSGID: =?utf-8?q?1749037496782968023?= The network stack assumes that devices can handle an extra VLAN tag without increasing the MTU Signed-off-by: Felix Fietkau Reviewed-by: Vladimir Oltean --- 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 589f27ddc401..3d7cdc1efbbc 100644 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.h +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.h @@ -29,7 +29,7 @@ #define MTK_TX_DMA_BUF_LEN_V2 0xffff #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 | \