| From foo@baz Sun 09 Feb 2020 10:56:46 PM CET |
| From: Florian Fainelli <f.fainelli@gmail.com> |
| Date: Thu, 6 Feb 2020 11:07:45 -0800 |
| Subject: net: dsa: b53: Always use dev->vlan_enabled in b53_configure_vlan() |
| |
| From: Florian Fainelli <f.fainelli@gmail.com> |
| |
| [ Upstream commit df373702bc0f8f2d83980ea441e71639fc1efcf8 ] |
| |
| 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> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/net/dsa/b53/b53_common.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/drivers/net/dsa/b53/b53_common.c |
| +++ b/drivers/net/dsa/b53/b53_common.c |
| @@ -655,7 +655,7 @@ int b53_configure_vlan(struct dsa_switch |
| b53_do_vlan_op(dev, VTA_CMD_CLEAR); |
| } |
| |
| - b53_enable_vlan(dev, false, dev->vlan_filtering_enabled); |
| + b53_enable_vlan(dev, dev->vlan_enabled, dev->vlan_filtering_enabled); |
| |
| b53_for_each_port(dev, i) |
| b53_write16(dev, B53_VLAN_PAGE, |
