net: ti: am65-cpsw-nuss: remove guards against !BRIDGE_VLAN_INFO_BRENTRY

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>

diff --git a/drivers/net/ethernet/ti/am65-cpsw-switchdev.c b/drivers/net/ethernet/ti/am65-cpsw-switchdev.c
index 599708a3e81dbf9d25ae88b2485388598896f83a..d4c56da98a6aac1b90dca475fc49fb1f0ce5dd5e 100644 (file)
--- a/drivers/net/ethernet/ti/am65-cpsw-switchdev.c
+++ b/drivers/net/ethernet/ti/am65-cpsw-switchdev.c
@@ -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);
 }