lkml.org 
[lkml]   [2021]   [Sep]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.13 159/300] net: dsa: mt7530: remove the .port_set_mrouter implementation
    Date
    From: Vladimir Oltean <vladimir.oltean@nxp.com>

    [ Upstream commit cbbf09b5771e6e9da268bc0d2fb6e428afa787bc ]

    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 a8b659e7ff75 ("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: 5a30833b9a16 ("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>
    ---
    drivers/net/dsa/mt7530.c | 13 -------------
    1 file changed, 13 deletions(-)

    diff --git a/drivers/net/dsa/mt7530.c b/drivers/net/dsa/mt7530.c
    index 2b01efad1a51..647f8e5c16da 100644
    --- a/drivers/net/dsa/mt7530.c
    +++ b/drivers/net/dsa/mt7530.c
    @@ -1172,18 +1172,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)
    @@ -2847,7 +2835,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,
    --
    2.30.2


    \
     
     \ /
      Last update: 2021-09-13 16:07    [W:3.613 / U:0.168 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site