Commit 1d21c327 authored by Vladimir Oltean's avatar Vladimir Oltean Committed by David S. Miller
Browse files

net: ti: am65-cpsw-nuss: 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 318994d3

drivers/net/ethernet/ti/am65-cpsw-switchdev.c

+0 −4
Original line number Diff line number Diff line
@@ -237,15 +237,11 @@ static int am65_cpsw_port_vlans_add(struct am65_cpsw_port *port, 
{

	bool untag = vlan->flags & BRIDGE_VLAN_INFO_UNTAGGED;

	struct net_device *orig_dev = vlan->obj.orig_dev;

	bool cpu_port = netif_is_bridge_master(orig_dev);

	bool pvid = vlan->flags & BRIDGE_VLAN_INFO_PVID;



	netdev_dbg(port->ndev, "VID add: %s: vid:%u flags:%X\n",

		   port->ndev->name, vlan->vid, vlan->flags);



	if (cpu_port && !(vlan->flags & BRIDGE_VLAN_INFO_BRENTRY))

		return 0;



	return am65_cpsw_port_vlan_add(port, untag, pvid, vlan->vid, orig_dev);

}