]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit3b8fee6cf2e1dafe3551982a2864272467f00051
treea9964d7588ff04a29e7917c43fcc0389a74ef0f0
parent040f53a465c6c955c8b96b12bd37f3522efd1b1e
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: 18dea0fd1963 ("net: dsa: b53: Properly account for VLAN filtering")
Fixes: 89fb23a74505 ("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