net: ti: cpsw: remove guards against !BRIDGE_VLAN_INFO_BRENTRY

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

Since commit 3116ad0696dd ("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>

authored by

Vladimir Oltean and committed by

David S. Miller 4 years ago 5edb65ea 1d21c327

-4

1 changed file

expand all

drivers

net

ethernet

cpsw_switchdev.c

-4

drivers/net/ethernet/ti/cpsw_switchdev.c

··· 252 252 { 253 253 bool untag = vlan->flags & BRIDGE_VLAN_INFO_UNTAGGED; 254 254 struct net_device *orig_dev = vlan->obj.orig_dev; 255 - bool cpu_port = netif_is_bridge_master(orig_dev); 256 255 bool pvid = vlan->flags & BRIDGE_VLAN_INFO_PVID; 257 256 258 257 dev_dbg(priv->dev, "VID add: %s: vid:%u flags:%X\n", 259 258 priv->ndev->name, vlan->vid, vlan->flags); 260 - 261 - if (cpu_port && !(vlan->flags & BRIDGE_VLAN_INFO_BRENTRY)) 262 - return 0; 263 259 264 260 return cpsw_port_vlan_add(priv, untag, pvid, vlan->vid, orig_dev); 265 261 }