net: sparx5: 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/microchip/sparx5/sparx5_switchdev.c b/drivers/net/ethernet/microchip/sparx5/sparx5_switchdev.c
index 649ca609884a3f893868a4dc0475ebc8820d54b2..f5271c3ec133eefaef192c52798d5b8505c5b962 100644 (file)
--- a/drivers/net/ethernet/microchip/sparx5/sparx5_switchdev.c
+++ b/drivers/net/ethernet/microchip/sparx5/sparx5_switchdev.c
@@ -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;
        }