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

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

drivers/net/ethernet/microchip/sparx5/sparx5_switchdev.c

+4 −6
Original line number Diff line number Diff line
@@ -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);



		sparx5_sync_bridge_dev_addr(dev, sparx5, v->vid, true);

		}

		return 0;

	}