From patchwork Thu May 21 20:34:04 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?TWljaGHFgiBNaXJvc8WCYXc=?= X-Patchwork-Id: 27502 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@bilbo.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from ozlabs.org (ozlabs.org [203.10.76.45]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mx.ozlabs.org", Issuer "CA Cert Signing Authority" (verified OK)) by bilbo.ozlabs.org (Postfix) with ESMTPS id F1D83B7063 for ; Fri, 22 May 2009 06:34:36 +1000 (EST) Received: by ozlabs.org (Postfix) id E176ADE004; Fri, 22 May 2009 06:34:36 +1000 (EST) Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 7E881DDF8A for ; Fri, 22 May 2009 06:34:36 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756565AbZEUUeG (ORCPT ); Thu, 21 May 2009 16:34:06 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756446AbZEUUeF (ORCPT ); Thu, 21 May 2009 16:34:05 -0400 Received: from rere.qmqm.pl ([89.167.52.164]:48064 "EHLO rere.qmqm.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754348AbZEUUeE (ORCPT ); Thu, 21 May 2009 16:34:04 -0400 Received: by rere.qmqm.pl (Postfix, from userid 1000) id A449E13929; Thu, 21 May 2009 22:34:04 +0200 (CEST) From: =?UTF-8?Q?Micha=C5=82=20Miros=C5=82aw=20?= To: netdev@vger.kernel.org Message-ID: <1-1000-10527-1242938044-3360@rere.qmqm.pl> Subject: [PATCH 1/6 2.6.30-rc6] genetlink: Introduce genl_register_family_with_ops() Date: Thu, 21 May 2009 22:34:04 +0200 (CEST) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This introduces genl_register_family_with_ops() that registers a genetlink family along with operations from a table. This is used to kill copy'n'paste occurrences in following patches. Signed-off-by: Michał Mirosław --- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff -urN linux-orig-mqbr/include/net/genetlink.h linux-mqbr/include/net/genetlink.h --- linux-orig-mqbr/include/net/genetlink.h 2009-03-24 00:12:14.000000000 +0100 +++ linux-mqbr/include/net/genetlink.h 2009-05-21 17:46:30.000000000 +0200 @@ -88,6 +88,8 @@ }; extern int genl_register_family(struct genl_family *family); +extern int genl_register_family_with_ops(struct genl_family *family, + struct genl_ops *ops, size_t n_ops); extern int genl_unregister_family(struct genl_family *family); extern int genl_register_ops(struct genl_family *, struct genl_ops *ops); extern int genl_unregister_ops(struct genl_family *, struct genl_ops *ops); diff -urN linux-orig-mqbr/net/netlink/genetlink.c linux-mqbr/net/netlink/genetlink.c --- linux-orig-mqbr/net/netlink/genetlink.c 2009-03-24 00:12:14.000000000 +0100 +++ linux-mqbr/net/netlink/genetlink.c 2009-05-21 18:43:34.000000000 +0200 @@ -384,6 +384,52 @@ } /** + * genl_register_family_with_ops - register a generic netlink family + * @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. + * + * This is equivalent to calling genl_register_family() followed by + * genl_register_ops() for every operation entry in the table taking + * care to unregister the family on error path. + * + * Return 0 on success or a negative error code. + */ +int genl_register_family_with_ops(struct genl_family *family, + struct genl_ops *ops, size_t n_ops) +{ + int err, i; + + err = genl_register_family(family); + if (err) + return err; + + for (i = 0; i < n_ops; ++i, ++ops) { + err = genl_register_ops(family, ops); + if (err) + goto err_out; + } + return 0; +err_out: + genl_unregister_family(family); + return err; +} +EXPORT_SYMBOL(genl_register_family_with_ops); + +/** * genl_unregister_family - unregister generic netlink family * @family: generic netlink family *