Commit ddaff504 authored Feb 16, 2022 by Vladimir Oltean Committed by David S. Miller Feb 17, 2022

mlxsw: spectrum: 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: Vladimir Oltean <vladimir.oltean@nxp.com>
Reviewed-by: Ido Schimmel <idosch@nvidia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 5da1033b

drivers/net/ethernet/mellanox/mlxsw/spectrum_span.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -269,9 +269,7 @@ mlxsw_sp_span_entry_bridge_8021q(const struct net_device *br_dev,

		if (!vid && WARN_ON(br_vlan_get_pvid(br_dev, &vid)))
		return NULL;
		if (!vid \|\|
		br_vlan_get_info(br_dev, vid, &vinfo) \|\|
		!(vinfo.flags & BRIDGE_VLAN_INFO_BRENTRY))
		if (!vid \|\| br_vlan_get_info(br_dev, vid, &vinfo))
		return NULL;

		edev = br_fdb_find_port(br_dev, dmac, vid);

drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -1234,8 +1234,7 @@ static int mlxsw_sp_port_vlans_add(struct mlxsw_sp_port *mlxsw_sp_port,
		if (netif_is_bridge_master(orig_dev)) {
		int err = 0;

		if ((vlan->flags & BRIDGE_VLAN_INFO_BRENTRY) &&
		br_vlan_enabled(orig_dev))
		if (br_vlan_enabled(orig_dev))
		err = mlxsw_sp_br_ban_rif_pvid_change(mlxsw_sp,
		orig_dev, vlan);
		if (!err)