Merge tag 'wireless-drivers-next-for-davem-2017-02-09' of git://git.kernel.org/pub...

[mirror_ubuntu-artful-kernel.git] / net / bridge / br_sysfs_if.c

diff --git a/net/bridge/br_sysfs_if.c b/net/bridge/br_sysfs_if.c
index 8bd569695e76fb76112bd5c17fb1a8027c6590a5..05e8946ccc03554b8c842bd742bf6bed982f7ea6 100644 (file)
--- a/net/bridge/br_sysfs_if.c
+++ b/net/bridge/br_sysfs_if.c
@@ -188,6 +188,7 @@ static BRPORT_ATTR(multicast_router, S_IRUGO | S_IWUSR, show_multicast_router,
                   store_multicast_router);
 
 BRPORT_ATTR_FLAG(multicast_fast_leave, BR_MULTICAST_FAST_LEAVE);
+BRPORT_ATTR_FLAG(multicast_to_unicast, BR_MULTICAST_TO_UNICAST);
 #endif
 
 static const struct brport_attribute *brport_attrs[] = {
@@ -214,6 +215,7 @@ static const struct brport_attribute *brport_attrs[] = {
 #ifdef CONFIG_BRIDGE_IGMP_SNOOPING
        &brport_attr_multicast_router,
        &brport_attr_multicast_fast_leave,
+       &brport_attr_multicast_to_unicast,
 #endif
        &brport_attr_proxyarp,
        &brport_attr_proxyarp_wifi,