bridge: netlink: add support for multicast_snooping

Add IFLA_BR_MCAST_SNOOPING to allow enabling/disabling multicast
snooping via netlink.

Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/uapi/linux/if_link.h b/include/uapi/linux/if_link.h
index 5d2c92973afe6bb08e32b595f3d1903bba893216..22cb395a713d93debf0125c397db4ac36bf72c51 100644 (file)
--- a/include/uapi/linux/if_link.h
+++ b/include/uapi/linux/if_link.h
@@ -246,6 +246,7 @@ enum {
        IFLA_BR_GROUP_ADDR,
        IFLA_BR_FDB_FLUSH,
        IFLA_BR_MCAST_ROUTER,
+       IFLA_BR_MCAST_SNOOPING,
        __IFLA_BR_MAX,
 };
 

diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c
index f4df609c1ad9282aeab86c25f473152807441832..25e1c66d70f10a71736384523495fe300dea95b0 100644 (file)
--- a/net/bridge/br_netlink.c
+++ b/net/bridge/br_netlink.c
@@ -768,6 +768,7 @@ static const struct nla_policy br_policy[IFLA_BR_MAX + 1] = {
        [IFLA_BR_GROUP_ADDR] = { .type = NLA_BINARY,
                                 .len  = ETH_ALEN },
        [IFLA_BR_MCAST_ROUTER] = { .type = NLA_U8 },
+       [IFLA_BR_MCAST_SNOOPING] = { .type = NLA_U8 },
 };
 
 static int br_changelink(struct net_device *brdev, struct nlattr *tb[],
@@ -871,6 +872,14 @@ static int br_changelink(struct net_device *brdev, struct nlattr *tb[],
                if (err)
                        return err;
        }
+
+       if (data[IFLA_BR_MCAST_SNOOPING]) {
+               u8 mcast_snooping = nla_get_u8(data[IFLA_BR_MCAST_SNOOPING]);
+
+               err = br_multicast_toggle(br, mcast_snooping);
+               if (err)
+                       return err;
+       }
 #endif
 
        return 0;
@@ -902,6 +911,7 @@ static size_t br_get_size(const struct net_device *brdev)
               nla_total_size(ETH_ALEN) +       /* IFLA_BR_GROUP_ADDR */
 #ifdef CONFIG_BRIDGE_IGMP_SNOOPING
               nla_total_size(sizeof(u8)) +     /* IFLA_BR_MCAST_ROUTER */
+              nla_total_size(sizeof(u8)) +     /* IFLA_BR_MCAST_SNOOPING */
 #endif
               0;
 }
@@ -960,7 +970,8 @@ static int br_fill_info(struct sk_buff *skb, const struct net_device *brdev)
 #endif
 
 #ifdef CONFIG_BRIDGE_IGMP_SNOOPING
-       if (nla_put_u8(skb, IFLA_BR_MCAST_ROUTER, br->multicast_router))
+       if (nla_put_u8(skb, IFLA_BR_MCAST_ROUTER, br->multicast_router) ||
+           nla_put_u8(skb, IFLA_BR_MCAST_SNOOPING, !br->multicast_disabled))
                return -EMSGSIZE;
 #endif