diff options
author | Johannes Berg <johannes.berg@intel.com> | 2013-11-15 14:19:08 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-11-15 20:50:23 -0500 |
commit | 568508aa0724cc39bcf7d3d8001bd27a45609800 (patch) | |
tree | 11e9648ccbd27021e18307f5639684b5c563c19c /include/net/genetlink.h | |
parent | 052e31281575b2894aad09672bd9ac435488ff04 (diff) | |
download | linux-568508aa0724cc39bcf7d3d8001bd27a45609800.tar.gz linux-568508aa0724cc39bcf7d3d8001bd27a45609800.tar.bz2 linux-568508aa0724cc39bcf7d3d8001bd27a45609800.zip |
genetlink: unify registration functions
Now that the ops assignment is just two variables rather than a
long list iteration etc., there's no reason to separately export
__genl_register_family() and __genl_register_family_with_ops().
Unify the two functions into __genl_register_family() and make
genl_register_family_with_ops() call it after assigning the ops.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/genetlink.h')
-rw-r--r-- | include/net/genetlink.h | 28 |
1 files changed, 24 insertions, 4 deletions
diff --git a/include/net/genetlink.h b/include/net/genetlink.h index 0b6a144468c6..e96385d46b48 100644 --- a/include/net/genetlink.h +++ b/include/net/genetlink.h @@ -131,14 +131,34 @@ static inline int genl_register_family(struct genl_family *family) return __genl_register_family(family); } -int __genl_register_family_with_ops(struct genl_family *family, - const struct genl_ops *ops, size_t n_ops); - +/** + * genl_register_family_with_ops - register a generic netlink family with ops + * @family: generic netlink family + * @ops: operations to be registered + * @n_ops: number of elements to register + * + * Registers the specified family and operations from the specified table. + * Only one family may be registered with the same family name or identifier. + * + * The family id may equal GENL_ID_GENERATE causing an unique id to + * be automatically generated and assigned. + * + * Either a doit or dumpit callback must be specified for every registered + * operation or the function will fail. Only one operation structure per + * command identifier may be registered. + * + * See include/net/genetlink.h for more documenation on the operations + * structure. + * + * Return 0 on success or a negative error code. + */ static inline int genl_register_family_with_ops(struct genl_family *family, const struct genl_ops *ops, size_t n_ops) { family->module = THIS_MODULE; - return __genl_register_family_with_ops(family, ops, n_ops); + family->ops = ops; + family->n_ops = n_ops; + return __genl_register_family(family); } int genl_unregister_family(struct genl_family *family); |