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 04/13] bridge: mcast: Rename MDB entry get function
Date: Mon, 16 Oct 2023 16:12:50 +0300 [thread overview]
Message-ID: <20231016131259.3302298-5-idosch@nvidia.com> (raw)
In-Reply-To: <20231016131259.3302298-1-idosch@nvidia.com>
The current name is going to conflict with the upcoming net device
operation for the MDB get operation.
Rename the function to br_mdb_entry_skb_get(). No functional changes
intended.
Signed-off-by: Ido Schimmel <idosch@nvidia.com>
---
net/bridge/br_device.c | 2 +-
net/bridge/br_input.c | 2 +-
net/bridge/br_multicast.c | 5 +++--
net/bridge/br_private.h | 10 ++++++----
4 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c
index 9a5ea06236bd..d624710b384a 100644
--- a/net/bridge/br_device.c
+++ b/net/bridge/br_device.c
@@ -92,7 +92,7 @@ netdev_tx_t br_dev_xmit(struct sk_buff *skb, struct net_device *dev)
goto out;
}
- mdst = br_mdb_get(brmctx, skb, vid);
+ mdst = br_mdb_entry_skb_get(brmctx, skb, vid);
if ((mdst || BR_INPUT_SKB_CB_MROUTERS_ONLY(skb)) &&
br_multicast_querier_exists(brmctx, eth_hdr(skb), mdst))
br_multicast_flood(mdst, skb, brmctx, false, true);
diff --git a/net/bridge/br_input.c b/net/bridge/br_input.c
index c729528b5e85..f21097e73482 100644
--- a/net/bridge/br_input.c
+++ b/net/bridge/br_input.c
@@ -175,7 +175,7 @@ int br_handle_frame_finish(struct net *net, struct sock *sk, struct sk_buff *skb
switch (pkt_type) {
case BR_PKT_MULTICAST:
- mdst = br_mdb_get(brmctx, skb, vid);
+ mdst = br_mdb_entry_skb_get(brmctx, skb, vid);
if ((mdst || BR_INPUT_SKB_CB_MROUTERS_ONLY(skb)) &&
br_multicast_querier_exists(brmctx, eth_hdr(skb), mdst)) {
if ((mdst && mdst->host_joined) ||
diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
index 96d1fc78dd39..d7d021af1029 100644
--- a/net/bridge/br_multicast.c
+++ b/net/bridge/br_multicast.c
@@ -145,8 +145,9 @@ static struct net_bridge_mdb_entry *br_mdb_ip6_get(struct net_bridge *br,
}
#endif
-struct net_bridge_mdb_entry *br_mdb_get(struct net_bridge_mcast *brmctx,
- struct sk_buff *skb, u16 vid)
+struct net_bridge_mdb_entry *
+br_mdb_entry_skb_get(struct net_bridge_mcast *brmctx, struct sk_buff *skb,
+ u16 vid)
{
struct net_bridge *br = brmctx->br;
struct br_ip ip;
diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
index cbbe35278459..3220898424ce 100644
--- a/net/bridge/br_private.h
+++ b/net/bridge/br_private.h
@@ -951,8 +951,9 @@ int br_multicast_rcv(struct net_bridge_mcast **brmctx,
struct net_bridge_mcast_port **pmctx,
struct net_bridge_vlan *vlan,
struct sk_buff *skb, u16 vid);
-struct net_bridge_mdb_entry *br_mdb_get(struct net_bridge_mcast *brmctx,
- struct sk_buff *skb, u16 vid);
+struct net_bridge_mdb_entry *
+br_mdb_entry_skb_get(struct net_bridge_mcast *brmctx, struct sk_buff *skb,
+ u16 vid);
int br_multicast_add_port(struct net_bridge_port *port);
void br_multicast_del_port(struct net_bridge_port *port);
void br_multicast_enable_port(struct net_bridge_port *port);
@@ -1341,8 +1342,9 @@ static inline int br_multicast_rcv(struct net_bridge_mcast **brmctx,
return 0;
}
-static inline struct net_bridge_mdb_entry *br_mdb_get(struct net_bridge_mcast *brmctx,
- struct sk_buff *skb, u16 vid)
+static inline struct net_bridge_mdb_entry *
+br_mdb_entry_skb_get(struct net_bridge_mcast *brmctx, struct sk_buff *skb,
+ u16 vid)
{
return NULL;
}
--
2.40.1
next prev parent reply other threads:[~2023-10-16 13:12 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-16 13:12 [Bridge] [PATCH net-next 00/13] Add MDB get support Ido Schimmel
2023-10-16 13:12 ` [Bridge] [PATCH net-next 01/13] bridge: mcast: Dump MDB entries even when snooping is disabled Ido Schimmel
2023-10-17 9:04 ` Nikolay Aleksandrov
2023-10-16 13:12 ` [Bridge] [PATCH net-next 02/13] bridge: mcast: Account for missing attributes Ido Schimmel
2023-10-17 9:05 ` Nikolay Aleksandrov
2023-10-16 13:12 ` [Bridge] [PATCH net-next 03/13] bridge: mcast: Factor out a helper for PG entry size calculation Ido Schimmel
2023-10-17 9:05 ` Nikolay Aleksandrov
2023-10-16 13:12 ` Ido Schimmel [this message]
2023-10-17 9:06 ` [Bridge] [PATCH net-next 04/13] bridge: mcast: Rename MDB entry get function Nikolay Aleksandrov
2023-10-16 13:12 ` [Bridge] [PATCH net-next 05/13] vxlan: mdb: Adjust function arguments Ido Schimmel
2023-10-17 9:06 ` Nikolay Aleksandrov
2023-10-16 13:12 ` [Bridge] [PATCH net-next 06/13] vxlan: mdb: Factor out a helper for remote entry size calculation Ido Schimmel
2023-10-17 9:06 ` Nikolay Aleksandrov
2023-10-16 13:12 ` [Bridge] [PATCH net-next 07/13] bridge: add MDB get uAPI attributes Ido Schimmel
2023-10-17 9:08 ` Nikolay Aleksandrov
2023-10-17 10:58 ` Ido Schimmel
2023-10-16 13:12 ` [Bridge] [PATCH net-next 08/13] net: Add MDB get device operation Ido Schimmel
2023-10-17 9:08 ` Nikolay Aleksandrov
2023-10-16 13:12 ` [Bridge] [PATCH net-next 09/13] bridge: mcast: Add MDB get support Ido Schimmel
2023-10-17 9:24 ` Nikolay Aleksandrov
2023-10-17 11:03 ` Ido Schimmel
2023-10-17 12:53 ` Nikolay Aleksandrov
2023-10-16 13:12 ` [Bridge] [PATCH net-next 10/13] vxlan: mdb: " Ido Schimmel
2023-10-17 9:28 ` Nikolay Aleksandrov
2023-10-16 13:12 ` [Bridge] [PATCH net-next 11/13] rtnetlink: " Ido Schimmel
2023-10-17 9:29 ` Nikolay Aleksandrov
2023-10-16 13:12 ` [Bridge] [PATCH net-next 12/13] selftests: bridge_mdb: Use MDB get instead of dump Ido Schimmel
2023-10-17 9:29 ` Nikolay Aleksandrov
2023-10-16 13:12 ` [Bridge] [PATCH net-next 13/13] selftests: vxlan_mdb: " Ido Schimmel
2023-10-17 9:30 ` Nikolay Aleksandrov
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=20231016131259.3302298-5-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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox