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

Commit 02154927 authored by Florian Fainelli's avatar Florian Fainelli Committed by David S. Miller
Browse files

net: dsa: bcm_sf2: Get VLAN_PORT_MASK from b53_device 



While migrating the bcm_sf2 driver to use b53_common, we left a small
piece untouched where we kept our local copy of the per-port
port_vlan_ctl bitmask value. This value is now maintained by b53_device
so we need to use it instead of our local (and now stale) copy of it.

Fixes: f458995b ("net: dsa: bcm_sf2: Utilize core B53 driver when possible")
Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8fee3156

drivers/net/dsa/bcm_sf2.c

+1 −1
Original line number Diff line number Diff line
@@ -256,7 +256,7 @@ static int bcm_sf2_port_setup(struct dsa_switch *ds, int port, 
	reg = core_readl(priv, CORE_PORT_VLAN_CTL_PORT(port));

	reg &= ~PORT_VLAN_CTRL_MASK;

	reg |= (1 << port);

	reg |= priv->port_sts[port].vlan_ctl_mask;

	reg |= priv->dev->ports[port].vlan_ctl_mask;

	core_writel(priv, reg, CORE_PORT_VLAN_CTL_PORT(port));



	bcm_sf2_imp_vlan_setup(ds, cpu_port);

drivers/net/dsa/bcm_sf2.h

+0 −2
Original line number Diff line number Diff line
@@ -50,8 +50,6 @@ struct bcm_sf2_port_status { 
	unsigned int link;



	struct ethtool_eee eee;



	u16 vlan_ctl_mask;

};



struct bcm_sf2_priv {