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: Linus Lüssing <linus.luessing@c0d3.blue>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/uapi/linux/if_bridge.h b/include/uapi/linux/if_bridge.h
index 13d59c51ef5bc7bef9889c83a4c0802f006b8382..6b56a7549531c42da3e9884958ac664cdcf75638 100644 (file)
--- 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 10c416c7bf4737b4c231987a6222fef7ac926ae1..3f839a8cc9fb23fe530d923a9d17e593a25b8756 100644 (file)
--- 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;
                }