OSDN Git Service

net: dsa: b53: Always use dev->vlan_enabled in b53_configure_vlan()
authorFlorian Fainelli <f.fainelli@gmail.com>
Thu, 6 Feb 2020 19:07:45 +0000 (11:07 -0800)
committerDavid S. Miller <davem@davemloft.net>
Fri, 7 Feb 2020 10:25:09 +0000 (11:25 +0100)
commitdf373702bc0f8f2d83980ea441e71639fc1efcf8
treea9964d7588ff04a29e7917c43fcc0389a74ef0f0
parent7d10f0774f9e32aa2f2e012f7fcb312a2ce422b9
net: dsa: b53: Always use dev->vlan_enabled in b53_configure_vlan()

b53_configure_vlan() is called by the bcm_sf2 driver upon setup and
indirectly through resume as well. During the initial setup, we are
guaranteed that dev->vlan_enabled is false, so there is no change in
behavior, however during suspend, we may have enabled VLANs before, so we
do want to restore that setting.

Fixes: dad8d7c6452b ("net: dsa: b53: Properly account for VLAN filtering")
Fixes: 967dd82ffc52 ("net: dsa: b53: Add support for Broadcom RoboSwitch")
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/dsa/b53/b53_common.c