[PATCH net-next 10/20] bridge: netlink: add support for multicast_router

[Nikolay Aleksandrov]

From: Nikolay Aleksandrov <niko...@cumulusnetworks.com>

Add IFLA_BR_MCAST_ROUTER to allow setting and retrieving
br->multicast_router when igmp snooping is enabled.

Signed-off-by: Nikolay Aleksandrov <niko...@cumulusnetworks.com>
---
 include/uapi/linux/if_link.h |  1 +
 net/bridge/br_netlink.c      | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/include/uapi/linux/if_link.h b/include/uapi/linux/if_link.h
index 9ca9bf8bfe04..5d2c92973afe 100644
--- a/include/uapi/linux/if_link.h
+++ b/include/uapi/linux/if_link.h
@@ -245,6 +245,7 @@ enum {
        IFLA_BR_GC_TIMER,
        IFLA_BR_GROUP_ADDR,
        IFLA_BR_FDB_FLUSH,
+       IFLA_BR_MCAST_ROUTER,
        __IFLA_BR_MAX,
 };
 
diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c
index 5853c5737006..f4df609c1ad9 100644
--- a/net/bridge/br_netlink.c
+++ b/net/bridge/br_netlink.c
@@ -767,6 +767,7 @@ static const struct nla_policy br_policy[IFLA_BR_MAX + 1] = 
{
        [IFLA_BR_GROUP_FWD_MASK] = { .type = NLA_U16 },
        [IFLA_BR_GROUP_ADDR] = { .type = NLA_BINARY,
                                 .len  = ETH_ALEN },
+       [IFLA_BR_MCAST_ROUTER] = { .type = NLA_U8 },
 };
 
 static int br_changelink(struct net_device *brdev, struct nlattr *tb[],
@@ -862,6 +863,16 @@ static int br_changelink(struct net_device *brdev, struct 
nlattr *tb[],
        if (data[IFLA_BR_FDB_FLUSH])
                br_fdb_flush(br);
 
+#ifdef CONFIG_BRIDGE_IGMP_SNOOPING
+       if (data[IFLA_BR_MCAST_ROUTER]) {
+               u8 multicast_router = nla_get_u8(data[IFLA_BR_MCAST_ROUTER]);
+
+               err = br_multicast_set_router(br, multicast_router);
+               if (err)
+                       return err;
+       }
+#endif
+
        return 0;
 }
 
@@ -889,6 +900,9 @@ static size_t br_get_size(const struct net_device *brdev)
               nla_total_size(sizeof(u64)) +    /* 
IFLA_BR_TOPOLOGY_CHANGE_TIMER */
               nla_total_size(sizeof(u64)) +    /* IFLA_BR_GC_TIMER */
               nla_total_size(ETH_ALEN) +       /* IFLA_BR_GROUP_ADDR */
+#ifdef CONFIG_BRIDGE_IGMP_SNOOPING
+              nla_total_size(sizeof(u8)) +     /* IFLA_BR_MCAST_ROUTER */
+#endif
               0;
 }
 
@@ -945,6 +959,11 @@ static int br_fill_info(struct sk_buff *skb, const struct 
net_device *brdev)
                return -EMSGSIZE;
 #endif
 
+#ifdef CONFIG_BRIDGE_IGMP_SNOOPING
+       if (nla_put_u8(skb, IFLA_BR_MCAST_ROUTER, br->multicast_router))
+               return -EMSGSIZE;
+#endif
+
        return 0;
 }
 
-- 
2.4.3

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html