Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 864cd7b0 authored by Vladimir Oltean's avatar Vladimir Oltean Committed by David S. Miller
Browse files

net: dsa: b53: Let DSA call .port_vlan_filtering only when necessary 



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: default avatarVladimir Oltean <olteanv@gmail.com>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ec9121e7

drivers/net/dsa/b53/b53_common.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

	}