Skip to content

Commit

Permalink
net: sparx5: remove guards against !BRIDGE_VLAN_INFO_BRENTRY
Browse files Browse the repository at this point in the history
Since commit 3116ad0 ("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: Vladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Vladimir Oltean authored and David S. Miller committed Feb 17, 2022
1 parent ba43b54 commit 318994d
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions drivers/net/ethernet/microchip/sparx5/sparx5_switchdev.c
Original file line number Diff line number Diff line change
Expand Up @@ -369,13 +369,11 @@ static int sparx5_handle_port_vlan_add(struct net_device *dev,
struct sparx5_port *port = netdev_priv(dev);

if (netif_is_bridge_master(dev)) {
if (v->flags & BRIDGE_VLAN_INFO_BRENTRY) {
struct sparx5 *sparx5 =
container_of(nb, struct sparx5,
switchdev_blocking_nb);
struct sparx5 *sparx5 =
container_of(nb, struct sparx5,
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;
}

Expand Down

0 comments on commit 318994d

Please sign in to comment.