From patchwork Sun Oct 3 15:51:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Lunn X-Patchwork-Id: 12532785 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 672A1C433EF for ; Sun, 3 Oct 2021 15:51:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3DF5D611EE for ; Sun, 3 Oct 2021 15:51:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231165AbhJCPxh (ORCPT ); Sun, 3 Oct 2021 11:53:37 -0400 Received: from vps0.lunn.ch ([185.16.172.187]:45864 "EHLO vps0.lunn.ch" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230426AbhJCPxg (ORCPT ); Sun, 3 Oct 2021 11:53:36 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lunn.ch; s=20171124; h=Content-Transfer-Encoding:MIME-Version:Message-Id:Date:Subject: Cc:To:From:From:Sender:Reply-To:Subject:Date:Message-ID:To:Cc:MIME-Version: Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description: Content-Disposition:In-Reply-To:References; bh=uXu2riDUwV7yTnOtHxpidVzihTTM0n5SLysZ2BIzaZI=; b=sC8D3ETj1uLIy7RWyGAvzcruC7 ypHh1FzPdqXYoqB9a5HrihWOGTmnwISMJzzaLN7GTxTgG06Mi+w5h+ctdFpZiflQ+ztx4bHxjw75b ILLRcSHR24LIoKtcTbOXlca4WlgUAfPiTZEzOTes8PR8wB5PjOqu6M8xdz+H4WEZzufA=; Received: from andrew by vps0.lunn.ch with local (Exim 4.94.2) (envelope-from ) id 1mX3mF-009P4z-IE; Sun, 03 Oct 2021 17:51:47 +0200 From: Andrew Lunn To: netdev Cc: Tobias Waldekranz , Vladimir Oltean , Florian Fainelli , Andrew Lunn Subject: [PATCH net] dsa: tag_dsa: Handle !CONFIG_BRIDGE_VLAN_FILTERING case Date: Sun, 3 Oct 2021 17:51:41 +0200 Message-Id: <20211003155141.2241314-1-andrew@lunn.ch> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org If CONFIG_BRIDGE_VLAN_FILTERING is disabled, br_vlan_enabled() is replaced with a stub which returns -EINVAL. As a result the tagger drops the frame. Rather than drop the frame, use a pvid of 0. Fixes: d82f8ab0d874 ("net: dsa: tag_dsa: offload the bridge forwarding process") Signed-off-by: Andrew Lunn --- net/dsa/tag_dsa.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/dsa/tag_dsa.c b/net/dsa/tag_dsa.c index e5127b7d1c6a..8daa8b7787c0 100644 --- a/net/dsa/tag_dsa.c +++ b/net/dsa/tag_dsa.c @@ -149,7 +149,8 @@ static struct sk_buff *dsa_xmit_ll(struct sk_buff *skb, struct net_device *dev, * inject packets to hardware using the bridge's pvid, since * that's where the packets ingressed from. */ - if (!br_vlan_enabled(br)) { + if (IS_ENABLED(CONFIG_BRIDGE_VLAN_FILTERING) && + !br_vlan_enabled(br)) { /* Safe because __dev_queue_xmit() runs under * rcu_read_lock_bh() */