From: Ido Schimmel <idosch@nvidia.com>
To: netdev@vger.kernel.org, bridge@lists.linux-foundation.org
Cc: mlxsw@nvidia.com, razor@blackwall.org,
Ido Schimmel <idosch@nvidia.com>,
edumazet@google.com, roopa@nvidia.com, kuba@kernel.org,
pabeni@redhat.com, davem@davemloft.net
Subject: [Bridge] [PATCH net-next 8/8] bridge: mcast: Remove redundant function arguments
Date: Mon, 5 Dec 2022 09:42:51 +0200 [thread overview]
Message-ID: <20221205074251.4049275-9-idosch@nvidia.com> (raw)
In-Reply-To: <20221205074251.4049275-1-idosch@nvidia.com>
Drop the first three arguments and instead extract them from the MDB
configuration structure.
Signed-off-by: Ido Schimmel <idosch@nvidia.com>
---
net/bridge/br_mdb.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/net/bridge/br_mdb.c b/net/bridge/br_mdb.c
index aa5faccf09f8..850a04177c91 100644
--- a/net/bridge/br_mdb.c
+++ b/net/bridge/br_mdb.c
@@ -786,13 +786,14 @@ __br_mdb_choose_context(struct net_bridge *br,
return brmctx;
}
-static int br_mdb_add_group(struct net_bridge *br, struct net_bridge_port *port,
- struct br_mdb_entry *entry,
- struct br_mdb_config *cfg,
+static int br_mdb_add_group(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(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;
--
2.37.3
WARNING: multiple messages have this Message-ID (diff)
From: Ido Schimmel <idosch@nvidia.com>
To: netdev@vger.kernel.org, bridge@lists.linux-foundation.org
Cc: davem@davemloft.net, kuba@kernel.org, pabeni@redhat.com,
edumazet@google.com, roopa@nvidia.com, razor@blackwall.org,
mlxsw@nvidia.com, Ido Schimmel <idosch@nvidia.com>
Subject: [PATCH net-next 8/8] bridge: mcast: Remove redundant function arguments
Date: Mon, 5 Dec 2022 09:42:51 +0200 [thread overview]
Message-ID: <20221205074251.4049275-9-idosch@nvidia.com> (raw)
In-Reply-To: <20221205074251.4049275-1-idosch@nvidia.com>
Drop the first three arguments and instead extract them from the MDB
configuration structure.
Signed-off-by: Ido Schimmel <idosch@nvidia.com>
---
net/bridge/br_mdb.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/net/bridge/br_mdb.c b/net/bridge/br_mdb.c
index aa5faccf09f8..850a04177c91 100644
--- a/net/bridge/br_mdb.c
+++ b/net/bridge/br_mdb.c
@@ -786,13 +786,14 @@ __br_mdb_choose_context(struct net_bridge *br,
return brmctx;
}
-static int br_mdb_add_group(struct net_bridge *br, struct net_bridge_port *port,
- struct br_mdb_entry *entry,
- struct br_mdb_config *cfg,
+static int br_mdb_add_group(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(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;
--
2.37.3
next prev parent reply other threads:[~2022-12-05 7:42 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-05 7:42 [Bridge] [PATCH net-next 0/8] bridge: mcast: Preparations for EVPN extensions Ido Schimmel
2022-12-05 7:42 ` Ido Schimmel
2022-12-05 7:42 ` [Bridge] [PATCH net-next 1/8] bridge: mcast: Centralize netlink attribute parsing Ido Schimmel
2022-12-05 7:42 ` Ido Schimmel
2022-12-05 11:34 ` [Bridge] " Nikolay Aleksandrov
2022-12-05 11:34 ` Nikolay Aleksandrov
2022-12-06 9:53 ` [Bridge] " Ido Schimmel
2022-12-06 9:53 ` Ido Schimmel
2022-12-05 7:42 ` [Bridge] [PATCH net-next 2/8] bridge: mcast: Remove redundant checks Ido Schimmel
2022-12-05 7:42 ` Ido Schimmel
2022-12-05 11:34 ` [Bridge] " Nikolay Aleksandrov
2022-12-05 11:34 ` Nikolay Aleksandrov
2022-12-05 7:42 ` [Bridge] [PATCH net-next 3/8] bridge: mcast: Use MDB configuration structure where possible Ido Schimmel
2022-12-05 7:42 ` Ido Schimmel
2022-12-05 11:35 ` [Bridge] " Nikolay Aleksandrov
2022-12-05 11:35 ` Nikolay Aleksandrov
2022-12-05 7:42 ` [Bridge] [PATCH net-next 4/8] bridge: mcast: Propagate MDB configuration structure further Ido Schimmel
2022-12-05 7:42 ` Ido Schimmel
2022-12-05 11:40 ` [Bridge] " Nikolay Aleksandrov
2022-12-05 11:40 ` Nikolay Aleksandrov
2022-12-05 7:42 ` [Bridge] [PATCH net-next 5/8] bridge: mcast: Use MDB group key from configuration structure Ido Schimmel
2022-12-05 7:42 ` Ido Schimmel
2022-12-05 11:41 ` [Bridge] " Nikolay Aleksandrov
2022-12-05 11:41 ` Nikolay Aleksandrov
2022-12-05 7:42 ` [Bridge] [PATCH net-next 6/8] bridge: mcast: Remove br_mdb_parse() Ido Schimmel
2022-12-05 7:42 ` Ido Schimmel
2022-12-05 11:42 ` [Bridge] " Nikolay Aleksandrov
2022-12-05 11:42 ` Nikolay Aleksandrov
2022-12-05 7:42 ` [Bridge] [PATCH net-next 7/8] bridge: mcast: Move checks out of critical section Ido Schimmel
2022-12-05 7:42 ` Ido Schimmel
2022-12-05 11:43 ` [Bridge] " Nikolay Aleksandrov
2022-12-05 11:43 ` Nikolay Aleksandrov
2022-12-05 7:42 ` Ido Schimmel [this message]
2022-12-05 7:42 ` [PATCH net-next 8/8] bridge: mcast: Remove redundant function arguments Ido Schimmel
2022-12-05 11:43 ` [Bridge] " Nikolay Aleksandrov
2022-12-05 11:43 ` Nikolay Aleksandrov
2022-12-05 11:55 ` [Bridge] [PATCH net-next 0/8] bridge: mcast: Preparations for EVPN extensions Nikolay Aleksandrov
2022-12-05 11:55 ` Nikolay Aleksandrov
2022-12-06 9:58 ` [Bridge] " Ido Schimmel
2022-12-06 9:58 ` Ido Schimmel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221205074251.4049275-9-idosch@nvidia.com \
--to=idosch@nvidia.com \
--cc=bridge@lists.linux-foundation.org \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=kuba@kernel.org \
--cc=mlxsw@nvidia.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=razor@blackwall.org \
--cc=roopa@nvidia.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.