From: Nikolay Aleksandrov <nikolay@nvidia.com>
To: "Linus Lüssing" <linus.luessing@c0d3.blue>, netdev@vger.kernel.org
Cc: Roopa Prabhu <roopa@nvidia.com>, Jakub Kicinski <kuba@kernel.org>,
"David S . Miller" <davem@davemloft.net>,
bridge@lists.linux-foundation.org,
b.a.t.m.a.n@lists.open-mesh.org, linux-kernel@vger.kernel.org
Subject: Re: [net-next v2 10/11] net: bridge: mcast: add ip4+ip6 mcast router timers to mdb netlink
Date: Tue, 11 May 2021 12:30:26 +0300 [thread overview]
Message-ID: <04761487-8abe-830e-7cf1-84a270d58ff5@nvidia.com> (raw)
In-Reply-To: <20210509194509.10849-11-linus.luessing@c0d3.blue>
On 09/05/2021 22:45, Linus Lüssing wrote:
> Now that we have split the multicast router state into two, one for IPv4
> and one for IPv6, also add individual timers to the mdb netlink router
> port dump. Leaving the old timer attribute for backwards compatibility.
>
> Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
> ---
> include/uapi/linux/if_bridge.h | 2 ++
> net/bridge/br_mdb.c | 8 +++++++-
> 2 files changed, 9 insertions(+), 1 deletion(-)
>
Acked-by: Nikolay Aleksandrov <nikolay@nvidia.com>
> diff --git a/include/uapi/linux/if_bridge.h b/include/uapi/linux/if_bridge.h
> index 13d59c5..6b56a75 100644
> --- a/include/uapi/linux/if_bridge.h
> +++ b/include/uapi/linux/if_bridge.h
> @@ -627,6 +627,8 @@ enum {
> MDBA_ROUTER_PATTR_UNSPEC,
> MDBA_ROUTER_PATTR_TIMER,
> MDBA_ROUTER_PATTR_TYPE,
> + MDBA_ROUTER_PATTR_INET_TIMER,
> + MDBA_ROUTER_PATTR_INET6_TIMER,
> __MDBA_ROUTER_PATTR_MAX
> };
> #define MDBA_ROUTER_PATTR_MAX (__MDBA_ROUTER_PATTR_MAX - 1)
> diff --git a/net/bridge/br_mdb.c b/net/bridge/br_mdb.c
> index 3c608da..2cdd9b6 100644
> --- a/net/bridge/br_mdb.c
> +++ b/net/bridge/br_mdb.c
> @@ -79,7 +79,13 @@ static int br_rports_fill_info(struct sk_buff *skb, struct netlink_callback *cb,
> nla_put_u32(skb, MDBA_ROUTER_PATTR_TIMER,
> max(ip4_timer, ip6_timer)) ||
> nla_put_u8(skb, MDBA_ROUTER_PATTR_TYPE,
> - p->multicast_router)) {
> + p->multicast_router) ||
> + (have_ip4_mc_rtr &&
> + nla_put_u32(skb, MDBA_ROUTER_PATTR_INET_TIMER,
> + ip4_timer)) ||
> + (have_ip6_mc_rtr &&
> + nla_put_u32(skb, MDBA_ROUTER_PATTR_INET6_TIMER,
> + ip6_timer))) {
> nla_nest_cancel(skb, port_nest);
> goto fail;
> }
>
next prev parent reply other threads:[~2021-05-11 9:30 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-09 19:44 [PATCH net-next v2 00/11] net: bridge: split IPv4/v6 mc router state and export for batman-adv Linus Lüssing
2021-05-09 19:44 ` [net-next v2 01/11] net: bridge: mcast: rename multicast router lists and timers Linus Lüssing
2021-05-11 9:12 ` Nikolay Aleksandrov
2021-05-09 19:45 ` [net-next v2 02/11] net: bridge: mcast: add wrappers for router node retrieval Linus Lüssing
2021-05-11 9:12 ` Nikolay Aleksandrov
2021-05-09 19:45 ` [net-next v2 03/11] net: bridge: mcast: prepare mdb netlink for mcast router split Linus Lüssing
2021-05-11 9:13 ` Nikolay Aleksandrov
2021-05-09 19:45 ` [net-next v2 04/11] net: bridge: mcast: prepare query reception " Linus Lüssing
2021-05-11 9:13 ` Nikolay Aleksandrov
2021-05-09 19:45 ` [net-next v2 05/11] net: bridge: mcast: prepare is-router function " Linus Lüssing
2021-05-11 9:16 ` Nikolay Aleksandrov
2021-05-09 19:45 ` [net-next v2 06/11] net: bridge: mcast: prepare expiry functions " Linus Lüssing
2021-05-11 9:16 ` Nikolay Aleksandrov
2021-05-09 19:45 ` [net-next v2 07/11] net: bridge: mcast: prepare add-router function " Linus Lüssing
2021-05-09 19:45 ` [net-next v2 08/11] net: bridge: mcast: split router port del+notify " Linus Lüssing
2021-05-11 9:19 ` Nikolay Aleksandrov
2021-05-09 19:45 ` [net-next v2 09/11] net: bridge: mcast: split multicast router state for IPv4 and IPv6 Linus Lüssing
2021-05-11 9:29 ` Nikolay Aleksandrov
2021-05-11 9:33 ` Nikolay Aleksandrov
2021-05-11 11:28 ` Linus Lüssing
2021-05-09 19:45 ` [net-next v2 10/11] net: bridge: mcast: add ip4+ip6 mcast router timers to mdb netlink Linus Lüssing
2021-05-11 9:30 ` Nikolay Aleksandrov [this message]
2021-05-09 19:45 ` [net-next v2 11/11] net: bridge: mcast: export multicast router presence adjacent to a port Linus Lüssing
2021-05-11 9:23 ` 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=04761487-8abe-830e-7cf1-84a270d58ff5@nvidia.com \
--to=nikolay@nvidia.com \
--cc=b.a.t.m.a.n@lists.open-mesh.org \
--cc=bridge@lists.linux-foundation.org \
--cc=davem@davemloft.net \
--cc=kuba@kernel.org \
--cc=linus.luessing@c0d3.blue \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.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;
as well as URLs for NNTP newsgroup(s).