Commit d45c36ba authored by Florian Fainelli's avatar Florian Fainelli Committed by David S. Miller

net: dsa: b53: VLAN filtering is global to all users

The bcm_sf2 driver uses the b53 driver as a library but does not make
usre of the b53_setup() function, this made it fail to inherit the
vlan_filtering_is_global attribute. Fix this by moving the assignment to
b53_switch_alloc() which is used by bcm_sf2.

Fixes: 7228b23e ("net: dsa: b53: Let DSA handle mismatched VLAN filtering settings")
Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e323d865
...@@ -1105,13 +1105,6 @@ static int b53_setup(struct dsa_switch *ds) ...@@ -1105,13 +1105,6 @@ static int b53_setup(struct dsa_switch *ds)
b53_disable_port(ds, port); b53_disable_port(ds, port);
} }
/* Let DSA handle the case were multiple bridges span the same switch
* device and different VLAN awareness settings are requested, which
* would be breaking filtering semantics for any of the other bridge
* devices. (not hardware supported)
*/
ds->vlan_filtering_is_global = true;
return b53_setup_devlink_resources(ds); return b53_setup_devlink_resources(ds);
} }
...@@ -2664,6 +2657,13 @@ struct b53_device *b53_switch_alloc(struct device *base, ...@@ -2664,6 +2657,13 @@ struct b53_device *b53_switch_alloc(struct device *base,
ds->ops = &b53_switch_ops; ds->ops = &b53_switch_ops;
ds->untag_bridge_pvid = true; ds->untag_bridge_pvid = true;
dev->vlan_enabled = true; dev->vlan_enabled = true;
/* Let DSA handle the case were multiple bridges span the same switch
* device and different VLAN awareness settings are requested, which
* would be breaking filtering semantics for any of the other bridge
* devices. (not hardware supported)
*/
ds->vlan_filtering_is_global = true;
mutex_init(&dev->reg_mutex); mutex_init(&dev->reg_mutex);
mutex_init(&dev->stats_mutex); mutex_init(&dev->stats_mutex);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment