Merge drm/drm-fixes into drm-misc-fixes

[linux-2.6-block.git] / net / bridge / br_private.h

diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
index 646504db0220eaadf112a14a82a56f5223d264fa..ce2ab14ee60572f8bdb492456eb3ee023f24a6a3 100644 (file)
--- a/net/bridge/br_private.h
+++ b/net/bridge/br_private.h
@@ -199,6 +199,7 @@ struct net_bridge_fdb_entry {
 
 #define MDB_PG_FLAGS_PERMANENT BIT(0)
 #define MDB_PG_FLAGS_OFFLOAD   BIT(1)
+#define MDB_PG_FLAGS_FAST_LEAVE        BIT(2)
 
 struct net_bridge_port_group {
        struct net_bridge_port          *port;
@@ -701,6 +702,8 @@ void br_multicast_get_stats(const struct net_bridge *br,
                            struct br_mcast_stats *dest);
 void br_mdb_init(void);
 void br_mdb_uninit(void);
+void br_multicast_host_join(struct net_bridge_mdb_entry *mp, bool notify);
+void br_multicast_host_leave(struct net_bridge_mdb_entry *mp, bool notify);
 
 #define mlock_dereference(X, br) \
        rcu_dereference_protected(X, lockdep_is_held(&br->multicast_lock))