evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

drop_monitor: use genl_register_family_with_ops()

Browse source 
[ 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>
This commit is contained in:
Changli Gao 2010-07-26 20:59:42 -07:00 • committed by David S. Miller
parent 416c2f9cf5
commit a256be70c5
1 changed files with 7 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
net/core/drop_monitor.c
View file

@ -347,9 +347,9 @@ static struct notifier_block dropmon_net_notifier = {
static int __init init_net_drop_monitor(void) static int __init init_net_drop_monitor(void)
{ {
int cpu;
int rc, i, ret;
struct per_cpu_dm_data *data; struct per_cpu_dm_data *data;
int cpu, rc;
printk(KERN_INFO "Initalizing network drop monitor service\n"); printk(KERN_INFO "Initalizing network drop monitor service\n");
if (sizeof(void *) > 8) { if (sizeof(void *) > 8) {
@ -357,21 +357,12 @@ static int __init init_net_drop_monitor(void)
return -ENOSPC; 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"); printk(KERN_ERR "Could not create drop monitor netlink family\n");
return -EFAULT; return rc;
}
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;
}
} }
rc = register_netdevice_notifier(&dropmon_net_notifier); rc = register_netdevice_notifier(&dropmon_net_notifier);