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=-8.9 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, 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 325E2C43219 for ; Sun, 28 Apr 2019 18:48:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0170220652 for ; Sun, 28 Apr 2019 18:48:16 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="dmeslkiE" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727248AbfD1SsO (ORCPT ); Sun, 28 Apr 2019 14:48:14 -0400 Received: from mail-wr1-f67.google.com ([209.85.221.67]:43593 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727226AbfD1SsI (ORCPT ); Sun, 28 Apr 2019 14:48:08 -0400 Received: by mail-wr1-f67.google.com with SMTP id a12so12461681wrq.10 for ; Sun, 28 Apr 2019 11:48:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=BKuKrM+homq4Vwl7ipCAYFPTMKmvS+XSGeXAhWmNwRA=; b=dmeslkiEUQT+H2ZkZO+kIz/ahIx/uTA4peeGjNaMKknuAR3BDjgroxXgv3obogxJHE RUGGuwUP94L+alnEZUJojyioA2Aqcd80ANv5K39z7SJTBJlN725C5JbpFxbC0ryi271n nZCk/DJxS8D4O2meANSQvY3mA/SCkJczZE7MPpiFoy35xNJxeO9XD0fqEQvXNieUrSJ6 LKOPChK3JNSDkTwELoSUa7t/17B27W4mvxTR/Joqg3pfBRPDl6bltGphGyaebq1i8fS3 X4FI5wWWPD9FxU/v7T7XtMfYaE8wR+7XIH40VlB2EtydGk5iOlJciyuF6qztZLzWw557 k7bw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=BKuKrM+homq4Vwl7ipCAYFPTMKmvS+XSGeXAhWmNwRA=; b=n4w6/lMyWQB7Qxota0BccpTeEnNqD5rGZW7kTa74A5H7n6SapkHtfdn0Ebmly+ZVZm UT+y5l37hcEKwsG+bVUuPFWblUxqz9opYjrbn7EMqYxI2AxLZyBpgwlZBPtFs9ZWouTO sgHw9C5JCGN2Jy+SgYr0zH/1wFPP8h/8WIUuFG/wcN5rrQiURVvpjqPXNmxgxWIYpctr HHL6thgSPDdJkj8j148LgSHk0QS9Qj2MXwi04dsvPUk2dYGnhdFgDW1f/s0vPP8zEZEQ mSx5IE1Lu6tUCCOm3Q7XZHmlzr6FJCquXw/BaHGplXqikSC+vVcBQpw4c3Zfwx3QpLln i2hA== X-Gm-Message-State: APjAAAVFv9J4OpzPQNyEpNfYb3MhgB6qrKT/4/tCsqWZjX+JvLioA4Hb V42/aEODy8+APNozlEXX9vs= X-Google-Smtp-Source: APXvYqxZwElWOBbXJa5hSMILqYknR4ZWSWX15w9F+/2JpxegSzkDQM6a/+kV05aoboqI6/KIz3klBg== X-Received: by 2002:adf:ebd0:: with SMTP id v16mr10350260wrn.175.1556477286527; Sun, 28 Apr 2019 11:48:06 -0700 (PDT) Received: from localhost.localdomain (5-12-225-227.residential.rdsnet.ro. [5.12.225.227]) by smtp.gmail.com with ESMTPSA id h5sm12254910wmf.38.2019.04.28.11.48.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 28 Apr 2019 11:48:05 -0700 (PDT) From: Vladimir Oltean To: f.fainelli@gmail.com, vivien.didelot@gmail.com, andrew@lunn.ch, davem@davemloft.net Cc: netdev@vger.kernel.org, Vladimir Oltean Subject: [PATCH net-next 11/13] net: dsa: b53: Let DSA call .port_vlan_filtering only when necessary Date: Sun, 28 Apr 2019 21:45:52 +0300 Message-Id: <20190428184554.9968-12-olteanv@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190428184554.9968-1-olteanv@gmail.com> References: <20190428184554.9968-1-olteanv@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Since DSA has recently learned to treat better with drivers that set vlan_filtering_is_global, doing this is no longer required. Signed-off-by: Vladimir Oltean --- drivers/net/dsa/b53/b53_common.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/dsa/b53/b53_common.c b/drivers/net/dsa/b53/b53_common.c index a779b9c3ab6e..9fbeb20ba263 100644 --- a/drivers/net/dsa/b53/b53_common.c +++ b/drivers/net/dsa/b53/b53_common.c @@ -1286,13 +1286,13 @@ int b53_vlan_filtering(struct dsa_switch *ds, int port, bool vlan_filtering) b53_read16(dev, B53_VLAN_PAGE, B53_VLAN_PORT_DEF_TAG(port), &pvid); new_pvid = pvid; - if (dev->vlan_filtering_enabled && !vlan_filtering) { + if (!vlan_filtering) { /* Filtering is currently enabled, use the default PVID since * the bridge does not expect tagging anymore */ dev->ports[port].pvid = pvid; new_pvid = b53_default_pvid(dev); - } else if (!dev->vlan_filtering_enabled && vlan_filtering) { + } else { /* Filtering is currently disabled, restore the previous PVID */ new_pvid = dev->ports[port].pvid; } -- 2.17.1