Commit 090149ea authored by Ido Schimmel's avatar Ido Schimmel Committed by Jakub Kicinski

bridge: mcast: Remove redundant function arguments

Drop the first three arguments and instead extract them from the MDB
configuration structure.
Signed-off-by: default avatarIdo Schimmel <idosch@nvidia.com>
Acked-by: default avatarNikolay Aleksandrov <razor@blackwall.org>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 4c1ebc6c
...@@ -786,13 +786,14 @@ __br_mdb_choose_context(struct net_bridge *br, ...@@ -786,13 +786,14 @@ __br_mdb_choose_context(struct net_bridge *br,
return brmctx; return brmctx;
} }
static int br_mdb_add_group(struct net_bridge *br, struct net_bridge_port *port, static int br_mdb_add_group(const struct br_mdb_config *cfg,
struct br_mdb_entry *entry,
const struct br_mdb_config *cfg,
struct netlink_ext_ack *extack) struct netlink_ext_ack *extack)
{ {
struct net_bridge_mdb_entry *mp, *star_mp; struct net_bridge_mdb_entry *mp, *star_mp;
struct net_bridge_port_group __rcu **pp; 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_port_group *p;
struct net_bridge_mcast *brmctx; struct net_bridge_mcast *brmctx;
struct br_ip group = cfg->group; struct br_ip group = cfg->group;
...@@ -879,7 +880,7 @@ static int __br_mdb_add(const struct br_mdb_config *cfg, ...@@ -879,7 +880,7 @@ static int __br_mdb_add(const struct br_mdb_config *cfg,
int ret; int ret;
spin_lock_bh(&cfg->br->multicast_lock); 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); spin_unlock_bh(&cfg->br->multicast_lock);
return ret; return ret;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment