netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Vladimir Oltean <olteanv@gmail.com>
To: f.fainelli@gmail.com, vivien.didelot@gmail.com, andrew@lunn.ch,
	davem@davemloft.net
Cc: netdev@vger.kernel.org, Vladimir Oltean <olteanv@gmail.com>
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	[thread overview]
Message-ID: <20190428184554.9968-12-olteanv@gmail.com> (raw)
In-Reply-To: <20190428184554.9968-1-olteanv@gmail.com>

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 <olteanv@gmail.com>
---
 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


  parent reply	other threads:[~2019-04-28 18:48 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-04-28 18:45 [PATCH net-next 00/13] Improvements to DSA core VLAN manipulation Vladimir Oltean
2019-04-28 18:45 ` [PATCH net-next 01/13] net: dsa: Fix pharse -> phase typo Vladimir Oltean
2019-04-28 18:45 ` [PATCH net-next 02/13] net: dsa: Store vlan_filtering as a property of dsa_port Vladimir Oltean
2019-04-28 18:45 ` [PATCH net-next 03/13] net: dsa: Be aware of switches where VLAN filtering is a global setting Vladimir Oltean
2019-04-28 18:45 ` [PATCH net-next 04/13] net: dsa: b53: Let DSA handle mismatched VLAN filtering settings Vladimir Oltean
2019-04-28 18:45 ` [PATCH net-next 05/13] net: dsa: Unset vlan_filtering when ports leave the bridge Vladimir Oltean
2019-04-28 18:45 ` [PATCH net-next 06/13] net: dsa: mt7530: Let DSA handle the unsetting of vlan_filtering Vladimir Oltean
2019-04-28 18:45 ` [PATCH net-next 07/13] net: dsa: Keep the vlan_filtering setting in dsa_switch if it's global Vladimir Oltean
2019-04-28 18:45 ` [PATCH net-next 08/13] net: dsa: Add helper function to retrieve VLAN awareness setting Vladimir Oltean
2019-04-29 21:55   ` Andrew Lunn
2019-04-28 18:45 ` [PATCH net-next 09/13] net: dsa: mt7530: Use the DSA vlan_filtering helper function Vladimir Oltean
2019-04-28 18:45 ` [PATCH net-next 10/13] net: dsa: Skip calling .port_vlan_filtering on no change Vladimir Oltean
2019-04-29 21:57   ` Andrew Lunn
2019-04-28 18:45 ` Vladimir Oltean [this message]
2019-04-29 21:57   ` [PATCH net-next 11/13] net: dsa: b53: Let DSA call .port_vlan_filtering only when necessary Andrew Lunn
2019-04-28 18:45 ` [PATCH net-next 12/13] net: dsa: b53: Use vlan_filtering property from dsa_switch Vladimir Oltean
2019-04-29 21:58   ` Andrew Lunn
2019-04-28 18:45 ` [PATCH net-next 13/13] net: dsa: Add more convenient functions for installing port VLANs Vladimir Oltean
2019-05-01  3:05 ` [PATCH net-next 00/13] Improvements to DSA core VLAN manipulation David Miller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190428184554.9968-12-olteanv@gmail.com \
    --to=olteanv@gmail.com \
    --cc=andrew@lunn.ch \
    --cc=davem@davemloft.net \
    --cc=f.fainelli@gmail.com \
    --cc=netdev@vger.kernel.org \
    --cc=vivien.didelot@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).