Merge branches 'pm-qos' and 'pm-devfreq'

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

diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
index faa7261a992fa6df54afd4656b0e810102d59c30..8dc5c8d69bcd732ff365cd52cd54c386c874335e 100644 (file)
--- a/net/bridge/br_multicast.c
+++ b/net/bridge/br_multicast.c
@@ -2176,6 +2176,14 @@ unlock:
        return err;
 }
 
+bool br_multicast_enabled(const struct net_device *dev)
+{
+       struct net_bridge *br = netdev_priv(dev);
+
+       return !br->multicast_disabled;
+}
+EXPORT_SYMBOL_GPL(br_multicast_enabled);
+
 int br_multicast_set_querier(struct net_bridge *br, unsigned long val)
 {
        unsigned long max_delay;