Commit b7fb0916 authored by Linus Lüssing's avatar Linus Lüssing Committed by David S. Miller
Browse files

net: bridge: mcast: add ip4+ip6 mcast router timers to mdb netlink 



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: default avatarLinus Lüssing <linus.luessing@c0d3.blue>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a3c02e76

include/uapi/linux/if_bridge.h

+2 −0
Original line number Diff line number Diff line
@@ -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)

net/bridge/br_mdb.c

+7 −1
Original line number Diff line number Diff line
@@ -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;

		}