Skip to content

Commit

Permalink
net: dsa: mt7530: remove the .port_set_mrouter implementation
Browse files Browse the repository at this point in the history
[ Upstream commit cbbf09b ]

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 a8b659e ("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: 5a30833 ("net: dsa: mt7530: support MDB and bridge flag operations")
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
vladimiroltean authored and gregkh committed Sep 15, 2021
1 parent 6fb8c4f commit 3e409ec
Showing 1 changed file with 0 additions and 13 deletions.
13 changes: 0 additions & 13 deletions drivers/net/dsa/mt7530.c
Expand Up @@ -1185,18 +1185,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)
Expand Down Expand Up @@ -3058,7 +3046,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,
Expand Down

0 comments on commit 3e409ec

Please sign in to comment.