diff options
author | Takashi Iwai | 2015-01-26 13:53:41 +0100 |
---|---|---|
committer | Takashi Iwai | 2015-01-26 13:53:41 +0100 |
commit | 7533185eeefd087d5472422181ae8edf75118213 (patch) | |
tree | 6a62ccb019668215f70bcc9876a795548f57262a /include/net/genetlink.h | |
parent | b4b33f9d64c3edcdcbea874acdc1e9626fd961f1 (diff) | |
parent | 0767e95bb96d7fdddcd590fb809e6975d93aebc5 (diff) |
Merge branch 'for-linus' into for-next
Sync with the latest 3.19-rc state for applying other ALSA sequencer
core fixes.
Diffstat (limited to 'include/net/genetlink.h')
-rw-r--r-- | include/net/genetlink.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/include/net/genetlink.h b/include/net/genetlink.h index 84125088c309..6c92415311ca 100644 --- a/include/net/genetlink.h +++ b/include/net/genetlink.h @@ -27,13 +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 + * @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) |