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 877F4C43219 for ; Sun, 28 Apr 2019 18:48:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5001C20652 for ; Sun, 28 Apr 2019 18:48:11 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Kfysn18r" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727233AbfD1SsK (ORCPT ); Sun, 28 Apr 2019 14:48:10 -0400 Received: from mail-wr1-f67.google.com ([209.85.221.67]:35471 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727208AbfD1SsG (ORCPT ); Sun, 28 Apr 2019 14:48:06 -0400 Received: by mail-wr1-f67.google.com with SMTP id f7so3976697wrs.2 for ; Sun, 28 Apr 2019 11:48:05 -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=BvwFzHLyBngkzprjW3uy5wXXXANQEzx0IQIBSab+Ndc=; b=Kfysn18r8ZrpC/A0yUjcqbH5GDd84Wi340n7gLX9zAZCwtWwIUGko0oYLsa+a5WGZ3 S8ywgMwhwU54+to6r9HOnE4OMHMaD/7i3Rde7AZFrD7KkqcEa4WPpbzVdaEJCh47RYb+ Sxbvon7SDYncbHLNZNqoB4kWJTjLJgKPsHYeFoEnx59BfvxuTlOnQABc2zziYHehVrJZ Qg+7j33/DDqJBZgw+Uj9VIdYGfYk5IQGqF9H45mMS5XP71Q9GN94dXbYF4U0wfEPrXdt dWzAIO4LOmD25ScRf9kQtRISvYgaqtK2HvN862LTuVgVdYoC5PBJoY4z4KfMzj7Ipwet 9VvA== 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=BvwFzHLyBngkzprjW3uy5wXXXANQEzx0IQIBSab+Ndc=; b=m4nuKBZx0dHMtAY/dQLRrnNKTYrsUPdVQtkgQfnDeqhaXxA2eSTf6daHh+M3BZbupo uZCCPYDsCEqHunYP9f8Rv5RU3D5uzxd2qpC2m58MeXXF74tt8wl6F/cJQk1mqlgHS3kC 18wMKfMoyDZLYW8a4PDvUN0Ab47pBqs+GsrV8vDYcnWois1ljxeLxU3uQWO1bshMrloZ rBSgG7yHSi4pBFtJgMZbkZ1Miu91NYlvxQ5/cfyEsjxjclR5BcmnFWgfwdLe76nBspHk UBGVU4iN8ONb090rZWc5atUvqHDYSXtL5rN2iXmVbdIVwgclUS+QGlyb5gRlbzlo5OBY Cdag== X-Gm-Message-State: APjAAAUGA0LJFFuIGhULNC5VZLOOYoD7Q+hQwy/jSs5lKhlitZXAlNPN XZeIF6xNbxqJa5yvycL5oC4= X-Google-Smtp-Source: APXvYqy7uBj/dCw0GEKW5Mk7M1SFHapEo/tRS0BiZHXdeO/kJxfgPTb9gnyzC/0TOclTYW1wz4T2ww== X-Received: by 2002:adf:f791:: with SMTP id q17mr6058135wrp.223.1556477284563; Sun, 28 Apr 2019 11:48:04 -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.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 28 Apr 2019 11:48:04 -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 09/13] net: dsa: mt7530: Use the DSA vlan_filtering helper function Date: Sun, 28 Apr 2019 21:45:50 +0300 Message-Id: <20190428184554.9968-10-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 This was recently introduced, so keeping state inside the driver is no longer necessary. Signed-off-by: Vladimir Oltean Suggested-by: Andrew Lunn Reviewed-by: Andrew Lunn Reviewed-by: Florian Fainelli --- drivers/net/dsa/mt7530.c | 16 +++++----------- drivers/net/dsa/mt7530.h | 1 - 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/drivers/net/dsa/mt7530.c b/drivers/net/dsa/mt7530.c index 3530b6f38428..8d531c5f21f3 100644 --- a/drivers/net/dsa/mt7530.c +++ b/drivers/net/dsa/mt7530.c @@ -828,11 +828,9 @@ mt7530_port_set_vlan_unaware(struct dsa_switch *ds, int port) mt7530_rmw(priv, MT7530_PVC_P(port), VLAN_ATTR_MASK, VLAN_ATTR(MT7530_VLAN_TRANSPARENT)); - priv->ports[port].vlan_filtering = false; - for (i = 0; i < MT7530_NUM_PORTS; i++) { if (dsa_is_user_port(ds, i) && - priv->ports[i].vlan_filtering) { + dsa_port_is_vlan_filtering(&ds->ports[i])) { all_user_ports_removed = false; break; } @@ -891,8 +889,8 @@ mt7530_port_bridge_leave(struct dsa_switch *ds, int port, * And the other port's port matrix cannot be broken when the * other port is still a VLAN-aware port. */ - if (!priv->ports[i].vlan_filtering && - dsa_is_user_port(ds, i) && i != port) { + if (dsa_is_user_port(ds, i) && i != port && + !dsa_port_is_vlan_filtering(&ds->ports[i])) { if (dsa_to_port(ds, i)->bridge_dev != bridge) continue; if (priv->ports[i].enable) @@ -1011,10 +1009,6 @@ static int mt7530_port_vlan_filtering(struct dsa_switch *ds, int port, bool vlan_filtering) { - struct mt7530_priv *priv = ds->priv; - - priv->ports[port].vlan_filtering = vlan_filtering; - if (vlan_filtering) { /* The port is being kept as VLAN-unaware port when bridge is * set up with vlan_filtering not being set, Otherwise, the @@ -1139,7 +1133,7 @@ mt7530_port_vlan_add(struct dsa_switch *ds, int port, /* The port is kept as VLAN-unaware if bridge with vlan_filtering not * being set. */ - if (!priv->ports[port].vlan_filtering) + if (!dsa_port_is_vlan_filtering(&ds->ports[port])) return; mutex_lock(&priv->reg_mutex); @@ -1170,7 +1164,7 @@ mt7530_port_vlan_del(struct dsa_switch *ds, int port, /* The port is kept as VLAN-unaware if bridge with vlan_filtering not * being set. */ - if (!priv->ports[port].vlan_filtering) + if (!dsa_port_is_vlan_filtering(&ds->ports[port])) return 0; mutex_lock(&priv->reg_mutex); diff --git a/drivers/net/dsa/mt7530.h b/drivers/net/dsa/mt7530.h index a95ed958df5b..1eec7bdc283a 100644 --- a/drivers/net/dsa/mt7530.h +++ b/drivers/net/dsa/mt7530.h @@ -410,7 +410,6 @@ struct mt7530_port { bool enable; u32 pm; u16 pvid; - bool vlan_filtering; }; /* struct mt7530_priv - This is the main data structure for holding the state -- 2.17.1