1 files changed, 12 insertions, 2 deletions

diff --git a/include/net/genetlink.h b/include/net/genetlink.h
index af10c2cf8a1d..6c92415311ca 100644
--- a/include/net/genetlink.h
+++ b/include/net/genetlink.h
@@ -27,10 +27,18 @@ struct genl_info;
  * @maxattr: maximum number of attributes supported
  * @netnsok: set to true if the family can handle network
  *      namespaces and should be presented in all of them
+ * @parallel_ops: operations can be called in parallel and aren't
+ *      synchronized by the core genetlink code
  * @pre_doit: called before an operation's doit callback, it may
  *      do additional, common, filtering and return an error
  * @post_doit: called after an operation's doit callback, it may
  *      undo operations done by pre_doit, for example release locks
+ * @mcast_bind: a socket bound to the given multicast group (which
+ *      is given as the offset into the groups array)
+ * @mcast_unbind: a socket was unbound from the given multicast group.
+ *      Note that unbind() will not be called symmetrically if the
+ *      generic netlink family is removed while there are still open
+ *      sockets.
  * @attrbuf: buffer to store parsed attributes
  * @family_list: family list
  * @mcgrps: multicast groups used by this family (private)
@@ -53,6 +61,8 @@ struct genl_family {
         void                    (*post_doit)(const struct genl_ops *ops,
                                              struct sk_buff *skb,
                                              struct genl_info *info);
+        int                     (*mcast_bind)(struct net *net, int group);
+        void                    (*mcast_unbind)(struct net *net, int group);
         struct nlattr **        attrbuf;        /* private */
         const struct genl_ops * ops;            /* private */
         const struct genl_multicast_group *mcgrps; /* private */
@@ -395,11 +405,11 @@ static inline int genl_set_err(struct genl_family *family, struct net *net,
 }
 
 static inline int genl_has_listeners(struct genl_family *family,
-                                     struct sock *sk, unsigned int group)
+                                     struct net *net, unsigned int group)
 {
         if (WARN_ON_ONCE(group >= family->n_mcgrps))
                 return -EINVAL;
         group = family->mcgrp_offset + group;
-        return netlink_has_listeners(sk, group);
+        return netlink_has_listeners(net->genl_sock, group);
 }
 #endif  /* __NET_GENERIC_NETLINK_H */