From: "Linus Lüssing" <linus.luessing@c0d3.blue>
To: netdev@vger.kernel.org
Cc: "Roopa Prabhu" <roopa@nvidia.com>,
"Nikolay Aleksandrov" <nikolay@nvidia.com>,
"Jakub Kicinski" <kuba@kernel.org>,
"David S . Miller" <davem@davemloft.net>,
bridge@lists.linux-foundation.org, linux-kernel@vger.kernel.org,
"Linus Lüssing" <linus.luessing@c0d3.blue>
Subject: [net-next v4 06/11] net: bridge: mcast: prepare expiry functions for mcast router split
Date: Thu, 13 May 2021 15:20:48 +0200 [thread overview]
Message-ID: <20210513132053.23445-7-linus.luessing@c0d3.blue> (raw)
In-Reply-To: <20210513132053.23445-1-linus.luessing@c0d3.blue>
In preparation for the upcoming split of multicast router state into
their IPv4 and IPv6 variants move the protocol specific timer access to
an ip4 wrapper function.
Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
---
net/bridge/br_multicast.c | 31 ++++++++++++++++++++++---------
1 file changed, 22 insertions(+), 9 deletions(-)
diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
index 048b5b9..7815991 100644
--- a/net/bridge/br_multicast.c
+++ b/net/bridge/br_multicast.c
@@ -1354,16 +1354,16 @@ static int br_ip6_multicast_add_group(struct net_bridge *br,
}
#endif
-static void br_multicast_router_expired(struct timer_list *t)
+static void br_multicast_router_expired(struct net_bridge_port *port,
+ struct timer_list *t,
+ struct hlist_node *rlist)
{
- struct net_bridge_port *port =
- from_timer(port, t, ip4_mc_router_timer);
struct net_bridge *br = port->br;
spin_lock(&br->multicast_lock);
if (port->multicast_router == MDB_RTR_TYPE_DISABLED ||
port->multicast_router == MDB_RTR_TYPE_PERM ||
- timer_pending(&port->ip4_mc_router_timer))
+ timer_pending(t))
goto out;
__del_port_router(port);
@@ -1371,6 +1371,13 @@ out:
spin_unlock(&br->multicast_lock);
}
+static void br_ip4_multicast_router_expired(struct timer_list *t)
+{
+ struct net_bridge_port *port = from_timer(port, t, ip4_mc_router_timer);
+
+ br_multicast_router_expired(port, t, &port->ip4_rlist);
+}
+
static void br_mc_router_state_change(struct net_bridge *p,
bool is_mc_router)
{
@@ -1384,10 +1391,9 @@ static void br_mc_router_state_change(struct net_bridge *p,
switchdev_port_attr_set(p->dev, &attr, NULL);
}
-static void br_multicast_local_router_expired(struct timer_list *t)
+static void br_multicast_local_router_expired(struct net_bridge *br,
+ struct timer_list *timer)
{
- struct net_bridge *br = from_timer(br, t, ip4_mc_router_timer);
-
spin_lock(&br->multicast_lock);
if (br->multicast_router == MDB_RTR_TYPE_DISABLED ||
br->multicast_router == MDB_RTR_TYPE_PERM ||
@@ -1400,6 +1406,13 @@ out:
spin_unlock(&br->multicast_lock);
}
+static void br_ip4_multicast_local_router_expired(struct timer_list *t)
+{
+ struct net_bridge *br = from_timer(br, t, ip4_mc_router_timer);
+
+ br_multicast_local_router_expired(br, t);
+}
+
static void br_multicast_querier_expired(struct net_bridge *br,
struct bridge_mcast_own_query *query)
{
@@ -1615,7 +1628,7 @@ int br_multicast_add_port(struct net_bridge_port *port)
port->multicast_eht_hosts_limit = BR_MCAST_DEFAULT_EHT_HOSTS_LIMIT;
timer_setup(&port->ip4_mc_router_timer,
- br_multicast_router_expired, 0);
+ br_ip4_multicast_router_expired, 0);
timer_setup(&port->ip4_own_query.timer,
br_ip4_multicast_port_query_expired, 0);
#if IS_ENABLED(CONFIG_IPV6)
@@ -3319,7 +3332,7 @@ void br_multicast_init(struct net_bridge *br)
spin_lock_init(&br->multicast_lock);
timer_setup(&br->ip4_mc_router_timer,
- br_multicast_local_router_expired, 0);
+ br_ip4_multicast_local_router_expired, 0);
timer_setup(&br->ip4_other_query.timer,
br_ip4_multicast_querier_expired, 0);
timer_setup(&br->ip4_own_query.timer,
--
2.31.0
next prev parent reply other threads:[~2021-05-13 13:22 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-13 13:20 [PATCH net-next v4 00/11] net: bridge: split IPv4/v6 mc router state and export for batman-adv Linus Lüssing
2021-05-13 13:20 ` [net-next v4 01/11] net: bridge: mcast: rename multicast router lists and timers Linus Lüssing
2021-05-13 13:20 ` [net-next v4 02/11] net: bridge: mcast: add wrappers for router node retrieval Linus Lüssing
2021-05-13 13:20 ` [net-next v4 03/11] net: bridge: mcast: prepare mdb netlink for mcast router split Linus Lüssing
2021-05-13 13:20 ` [net-next v4 04/11] net: bridge: mcast: prepare query reception " Linus Lüssing
2021-05-13 13:20 ` [net-next v4 05/11] net: bridge: mcast: prepare is-router function " Linus Lüssing
2021-05-15 16:44 ` Guenter Roeck
2021-05-13 13:20 ` Linus Lüssing [this message]
2021-05-13 13:20 ` [net-next v4 07/11] net: bridge: mcast: prepare add-router " Linus Lüssing
2021-05-13 13:20 ` [net-next v4 08/11] net: bridge: mcast: split router port del+notify " Linus Lüssing
2021-05-13 13:20 ` [net-next v4 09/11] net: bridge: mcast: split multicast router state for IPv4 and IPv6 Linus Lüssing
2021-05-13 13:20 ` [net-next v4 10/11] net: bridge: mcast: add ip4+ip6 mcast router timers to mdb netlink Linus Lüssing
2021-05-13 13:20 ` [net-next v4 11/11] net: bridge: mcast: export multicast router presence adjacent to a port Linus Lüssing
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=20210513132053.23445-7-linus.luessing@c0d3.blue \
--to=linus.luessing@c0d3.blue \
--cc=bridge@lists.linux-foundation.org \
--cc=davem@davemloft.net \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=nikolay@nvidia.com \
--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;
as well as URLs for NNTP newsgroup(s).