OSDN Git Service

bridge: mcast: Remove redundant function arguments
authorIdo Schimmel <idosch@nvidia.com>
Tue, 6 Dec 2022 10:58:08 +0000 (12:58 +0200)
committerJakub Kicinski <kuba@kernel.org>
Thu, 8 Dec 2022 04:05:52 +0000 (20:05 -0800)
Drop the first three arguments and instead extract them from the MDB
configuration structure.

Signed-off-by: Ido Schimmel <idosch@nvidia.com>
Acked-by: Nikolay Aleksandrov <razor@blackwall.org>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
net/bridge/br_mdb.c

index d954d8f..ae7d93c 100644 (file)
@@ -786,13 +786,14 @@ out:
        return brmctx;
 }
 
-static int br_mdb_add_group(struct net_bridge *br, struct net_bridge_port *port,
-                           struct br_mdb_entry *entry,
-                           const struct br_mdb_config *cfg,
+static int br_mdb_add_group(const struct br_mdb_config *cfg,
                            struct netlink_ext_ack *extack)
 {
        struct net_bridge_mdb_entry *mp, *star_mp;
        struct net_bridge_port_group __rcu **pp;
+       struct br_mdb_entry *entry = cfg->entry;
+       struct net_bridge_port *port = cfg->p;
+       struct net_bridge *br = cfg->br;
        struct net_bridge_port_group *p;
        struct net_bridge_mcast *brmctx;
        struct br_ip group = cfg->group;
@@ -879,7 +880,7 @@ static int __br_mdb_add(const struct br_mdb_config *cfg,
        int ret;
 
        spin_lock_bh(&cfg->br->multicast_lock);
-       ret = br_mdb_add_group(cfg->br, cfg->p, cfg->entry, cfg, extack);
+       ret = br_mdb_add_group(cfg, extack);
        spin_unlock_bh(&cfg->br->multicast_lock);
 
        return ret;