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

net: dsa: mt7530: remove the .port_set_mrouter implementation 



DSA's idea of optimizing out multicast flooding to the CPU port leaves
quite a few holes open, so it should be reverted.

The mt7530 driver is the only new driver which added a .port_set_mrouter
implementation after the reorg from commit a8b659e7 ("net: dsa: act
as passthrough for bridge port flags"), so it needs to be reverted
separately so that the other revert commit can go a bit further down the
git history.

Fixes: 5a30833b ("net: dsa: mt7530: support MDB and bridge flag operations")
Signed-off-by: default avatarVladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7df4e744

drivers/net/dsa/mt7530.c

+0 −13
Original line number Diff line number Diff line
@@ -1189,18 +1189,6 @@ mt7530_port_bridge_flags(struct dsa_switch *ds, int port, 
	return 0;

}



static int

mt7530_port_set_mrouter(struct dsa_switch *ds, int port, bool mrouter,

			struct netlink_ext_ack *extack)

{

	struct mt7530_priv *priv = ds->priv;



	mt7530_rmw(priv, MT7530_MFC, UNM_FFP(BIT(port)),

		   mrouter ? UNM_FFP(BIT(port)) : 0);



	return 0;

}



static int

mt7530_port_bridge_join(struct dsa_switch *ds, int port,

			struct net_device *bridge)
@@ -3086,7 +3074,6 @@ static const struct dsa_switch_ops mt7530_switch_ops = { 
	.port_stp_state_set	= mt7530_stp_state_set,

	.port_pre_bridge_flags	= mt7530_port_pre_bridge_flags,

	.port_bridge_flags	= mt7530_port_bridge_flags,

	.port_set_mrouter	= mt7530_port_set_mrouter,

	.port_bridge_join	= mt7530_port_bridge_join,

	.port_bridge_leave	= mt7530_port_bridge_leave,

	.port_fdb_add		= mt7530_port_fdb_add,