2010-07-26 09:20:26

by Changli Gao

Subject: [PATCH] drop_monitor: use genl_register_family_with_ops()

Signed-off-by: Changli Gao <[email protected]>
----
net/core/drop_monitor.c | 19 +++++--------------
1 file changed, 5 insertions(+), 14 deletions(-)
diff --git a/net/core/drop_monitor.c b/net/core/drop_monitor.c
index 646ef3b..bdb0e96 100644
--- a/net/core/drop_monitor.c
+++ b/net/core/drop_monitor.c
@@ -357,21 +357,12 @@ static int __init init_net_drop_monitor(void)
return -ENOSPC;
}

- if (genl_register_family(&net_drop_monitor_family) < 0) {
+ rc = genl_register_family_with_ops(&net_drop_monitor_family,
+ dropmon_ops,
+ ARRAY_SIZE(dropmon_ops));
+ if (rc) {
printk(KERN_ERR "Could not create drop monitor netlink family\n");
- return -EFAULT;
- }
-
- rc = -EFAULT;
-
- for (i = 0; i < ARRAY_SIZE(dropmon_ops); i++) {
- ret = genl_register_ops(&net_drop_monitor_family,
- &dropmon_ops[i]);
- if (ret) {
- printk(KERN_CRIT "Failed to register operation %d\n",
- dropmon_ops[i].cmd);
- goto out_unreg;
- }
+ return rc;
}

rc = register_netdevice_notifier(&dropmon_net_notifier);

2010-07-26 10:47:47

by Neil Horman

Subject: Re: [PATCH] drop_monitor: use genl_register_family_with_ops()

On Mon, Jul 26, 2010 at 05:20:17PM +0800, Changli Gao wrote:
> Signed-off-by: Changli Gao <[email protected]>

> ----
> net/core/drop_monitor.c | 19 +++++--------------
> 1 file changed, 5 insertions(+), 14 deletions(-)
> diff --git a/net/core/drop_monitor.c b/net/core/drop_monitor.c
> index 646ef3b..bdb0e96 100644
> --- a/net/core/drop_monitor.c
> +++ b/net/core/drop_monitor.c
> @@ -357,21 +357,12 @@ static int __init init_net_drop_monitor(void)
> return -ENOSPC;
> }
>
> - if (genl_register_family(&net_drop_monitor_family) < 0) {
> + rc = genl_register_family_with_ops(&net_drop_monitor_family,
> + dropmon_ops,
> + ARRAY_SIZE(dropmon_ops));
> + if (rc) {
> printk(KERN_ERR "Could not create drop monitor netlink family\n");
> - return -EFAULT;
> - }
> -
> - rc = -EFAULT;
> -
> - for (i = 0; i < ARRAY_SIZE(dropmon_ops); i++) {
> - ret = genl_register_ops(&net_drop_monitor_family,
> - &dropmon_ops[i]);
> - if (ret) {
> - printk(KERN_CRIT "Failed to register operation %d\n",
> - dropmon_ops[i].cmd);
> - goto out_unreg;
> - }
> + return rc;
> }
>
> rc = register_netdevice_notifier(&dropmon_net_notifier);
>

Looks good to me, thanks!
Acked-by: Neil Horman <[email protected]>

2010-07-27 03:54:24

by David Miller

Subject: Re: [PATCH] drop_monitor: use genl_register_family_with_ops()

From: Neil Horman <[email protected]>
Date: Mon, 26 Jul 2010 06:44:23 -0400

> On Mon, Jul 26, 2010 at 05:20:17PM +0800, Changli Gao wrote:
>> Signed-off-by: Changli Gao <[email protected]>
...
> Looks good to me, thanks!
> Acked-by: Neil Horman <[email protected]>

Applied, thanks.