diff options
| author |   Vladimir Oltean <olteanv@gmail.com> | 2019-04-28 21:45:52 +0300 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2019-04-30 23:05:29 -0400 |
| commit | 864cd7b05dec190c7331a59c899749dbe940ecad (patch) | |
| tree | 61352b3b1a52ee88e05742f355ec2351b73d1011 /drivers/net/dsa/b53 | |
| parent | net: dsa: Skip calling .port_vlan_filtering on no change (diff) | |
| download | wireguard-linux-864cd7b05dec190c7331a59c899749dbe940ecad.tar.xz wireguard-linux-864cd7b05dec190c7331a59c899749dbe940ecad.zip | |
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: Vladimir Oltean <olteanv@gmail.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/dsa/b53')
| -rw-r--r-- | drivers/net/dsa/b53/b53_common.c | 4 |
1 files 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; } |