diff options
| author | David S. Miller <davem@davemloft.net> | 2021-08-06 12:11:13 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-08-06 12:11:13 +0200 |
| commit | 9b9311af4e8657be85bb1d083c531cfb6afb0d9c (patch) | |
| tree | ccde5e764d87abae9ede0f70c96206166d51be94 /drivers/net/dsa/mt7530.c | |
| parent | net: ethernet: ti: am65-cpsw: use napi_complete_done() in TX completion (diff) | |
| parent | net: dsa: don't disable multicast flooding to the CPU even without an IGMP qu... (diff) | |
| download | linux-9b9311af4e8657be85bb1d083c531cfb6afb0d9c.tar.xz linux-9b9311af4e8657be85bb1d083c531cfb6afb0d9c.zip | |
Merge branch 'dsa-cpu-flood'
Vladimir Oltean says:
====================
Always flood multicast to the DSA CPU port
Discussing with Qingfang, it became obvious that DSA is not prepared to
disable multicast flooding towards the CPU port under any circumstance
right now, and this in fact breaks traffic quite blatantly.
This series is a revert done in reverse chronological order. These
should be propagated to stable trees up to commit a8b659e7ff75 ("net:
dsa: act as passthrough for bridge port flags") which is in v5.12.
For older kernels, that commit blocks further backporting, so I need to
send a modified version of patch 3 separately to Greg after these go
into "net".
v1->v2: delete unused b53_set_mrouter function prototype
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/dsa/mt7530.c')
| -rw-r--r-- | drivers/net/dsa/mt7530.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/drivers/net/dsa/mt7530.c b/drivers/net/dsa/mt7530.c index 385e169080d9..c5bfbd1ac8aa 100644 --- a/drivers/net/dsa/mt7530.c +++ b/drivers/net/dsa/mt7530.c @@ -1190,18 +1190,6 @@ mt7530_port_bridge_flags(struct dsa_switch *ds, int port, } 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, |