diff options
| author | Changli Gao <xiaosuo@gmail.com> | 2010-07-26 20:59:42 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-07-26 20:59:42 -0700 |
| commit | a256be70c57d6f8c827d09d645a1f6fe9330af72 (patch) | |
| tree | 8557ccb681ea452f00057343e628f0d88b8d5cd3 /net/core/drop_monitor.c | |
| parent | 416c2f9cf5524cb53392cbcf99fef7aa687192ce (diff) | |
drop_monitor: use genl_register_family_with_ops()
[ Fix unused local variable build warnings. -DaveM ]
Signed-off-by: Changli Gao <xiaosuo@gmail.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core/drop_monitor.c')
| -rw-r--r-- | net/core/drop_monitor.c | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/net/core/drop_monitor.c b/net/core/drop_monitor.c index 646ef3bc720..36e603c78ce 100644 --- a/net/core/drop_monitor.c +++ b/net/core/drop_monitor.c @@ -347,9 +347,9 @@ static struct notifier_block dropmon_net_notifier = { static int __init init_net_drop_monitor(void) { - int cpu; - int rc, i, ret; struct per_cpu_dm_data *data; + int cpu, rc; + printk(KERN_INFO "Initalizing network drop monitor service\n"); if (sizeof(void *) > 8) { @@ -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); |