Commit 318994d3 authored by Vladimir Oltean's avatar Vladimir Oltean Committed by David S. Miller

net: sparx5: remove guards against !BRIDGE_VLAN_INFO_BRENTRY

Since commit 3116ad06 ("net: bridge: vlan: don't notify to switchdev
master VLANs without BRENTRY flag"), the bridge no longer emits
switchdev notifiers for VLANs that don't have the
BRIDGE_VLAN_INFO_BRENTRY flag, so these checks are dead code.
Remove them.
Signed-off-by: default avatarVladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ba43b547
...@@ -369,13 +369,11 @@ static int sparx5_handle_port_vlan_add(struct net_device *dev, ...@@ -369,13 +369,11 @@ static int sparx5_handle_port_vlan_add(struct net_device *dev,
struct sparx5_port *port = netdev_priv(dev); struct sparx5_port *port = netdev_priv(dev);
if (netif_is_bridge_master(dev)) { if (netif_is_bridge_master(dev)) {
if (v->flags & BRIDGE_VLAN_INFO_BRENTRY) {
struct sparx5 *sparx5 = struct sparx5 *sparx5 =
container_of(nb, struct sparx5, container_of(nb, struct sparx5,
switchdev_blocking_nb); switchdev_blocking_nb);
sparx5_sync_bridge_dev_addr(dev, sparx5, v->vid, true); sparx5_sync_bridge_dev_addr(dev, sparx5, v->vid, true);
}
return 0; return 0;
} }
......
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