From patchwork Mon Nov 7 18:54:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Fietkau X-Patchwork-Id: 16642 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp2234289wru; Mon, 7 Nov 2022 11:02:40 -0800 (PST) X-Google-Smtp-Source: AMsMyM5Llu7GhsNlgpytaxpVPfgk29this4h9/180ds4cAamOHNNQZ2P3CZXTPVtUYY8JQj+LI+J X-Received: by 2002:a17:902:74c3:b0:182:57fa:b9c4 with SMTP id f3-20020a17090274c300b0018257fab9c4mr52297768plt.104.1667847760099; Mon, 07 Nov 2022 11:02:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1667847760; cv=none; d=google.com; s=arc-20160816; b=nRmv6+bLwu1OmeVLV3ZaY29zdic6jj0uKRqniHX6GiUZw4NBCDVDVCFCmca/HNikym K/UyA0FGsPHzsCcDX30PNOqwO5MfzEpPK9U1k4pelW9TIFi3DZzeiNiLIaSQQvYY8qN4 PtejmHMWu07t85i5WntMYEGXJi1YD9eajtj4xpe9qdL/JvjW3r8elK4iEP/61sT6f6gb 7TFfJY70cHXf6h5QydbZJHWAcToTlaJH8dZWwLeG+uhK3C+DWkuPdoh9Q5FjctANP45p /uJ2HVTxO8vYa1UV0JG3JQur0XDaLqd4MUMa+lsN4OjVy67xlaiPXOXgaVZ1HyCz3NLT P4Iw== 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=rEqDOzrzv1cA6N1C5HIe09p8JEcexs62RmH77rmkVQs=; b=glFyq6m+G2XayF3fH1vTYaSlbdbDsAukbboEx7kWi3wivEjxBhlNFdFWcxtqfijzd0 zzeKlhhV624TECfN0OKTjCyDvzDFkOR3vlphfMdL+IcT9DRqlWIRWfYKiDc4wi0Iv2zD tk4f0dN58XJ0aPdqr0+s01NFa/6NrmvGxUQMkXb+gRC7VfGaI7lHSdrOzzQ72pyjeReS dY7VyKnXAUx7qX7r88aGpHvEGFdCANSU327thfn4AjvLK5OcF5aP8RTNMGVZxurCKoOA T3HgfxuvqQdbRyAmRsW6fUy2O6LF0Wx1QuvxsafoynTbWBtiLvUuPfbGxGFb3/+z41gB ExQg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@nbd.name header.s=20160729 header.b=IWCk0ao9; 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 a10-20020a17090abe0a00b002119e6aa0casi9588089pjs.43.2022.11.07.11.02.16; Mon, 07 Nov 2022 11:02:40 -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=IWCk0ao9; 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 S232952AbiKGSzc (ORCPT + 99 others); Mon, 7 Nov 2022 13:55:32 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35428 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231426AbiKGSza (ORCPT ); Mon, 7 Nov 2022 13:55:30 -0500 Received: from nbd.name (nbd.name [46.4.11.11]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A295E1139; Mon, 7 Nov 2022 10:55:29 -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=rEqDOzrzv1cA6N1C5HIe09p8JEcexs62RmH77rmkVQs=; b=IWCk0ao9veAQ5SBFD7O1oI/aTQ GbtUnG5IY6yzXmxO80j7/qvUBvKANFx+UwIqk1AfavoCvx+IqEkX2WhxEQOFtScwjsRR7iLO1Ff0t ebQVzDPNmEdZ9cbPfjYABI16FwypzAgvh2lXtSyakE/kbFZXPYxxnQ1OscuWonR+iRsY=; Received: from p200300daa72ee1007849d74f78949f6c.dip0.t-ipconnect.de ([2003:da:a72e:e100:7849:d74f:7894:9f6c] helo=Maecks.lan) by ds12 with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256 (Exim 4.94.2) (envelope-from ) id 1os7HE-000LCc-0p; Mon, 07 Nov 2022 19:55:20 +0100 From: Felix Fietkau To: netdev@vger.kernel.org, "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: linux-kernel@vger.kernel.org Subject: [PATCH 08/14] net: vlan: remove invalid VLAN protocol warning Date: Mon, 7 Nov 2022 19:54:46 +0100 Message-Id: <20221107185452.90711-8-nbd@nbd.name> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221107185452.90711-1-nbd@nbd.name> References: <20221107185452.90711-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?1748865132692295865?= X-GMAIL-MSGID: =?utf-8?q?1748865132692295865?= On MTK SoC ethernet, using NETIF_F_HW_VLAN_CTAG_RX in combination with hardware special tag parsing can pass the special tag port metadata as VLAN protocol ID. When the results is added as a skb hwaccel VLAN tag, it triggers a warning from vlan_do_receive before calling the DSA tag receive function. Remove this warning in order to properly pass the tag to the DSA receive function, which will parse and clear it. Signed-off-by: Felix Fietkau --- net/8021q/vlan.h | 1 - 1 file changed, 1 deletion(-) diff --git a/net/8021q/vlan.h b/net/8021q/vlan.h index 5eaf38875554..3f9c0406b266 100644 --- a/net/8021q/vlan.h +++ b/net/8021q/vlan.h @@ -44,7 +44,6 @@ static inline int vlan_proto_idx(__be16 proto) case htons(ETH_P_8021AD): return VLAN_PROTO_8021AD; default: - WARN(1, "invalid VLAN protocol: 0x%04x\n", ntohs(proto)); return -EINVAL; } }