Message ID | 1280136017-17526-1-git-send-email-xiaosuo@gmail.com |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
On Mon, Jul 26, 2010 at 05:20:17PM +0800, Changli Gao wrote: > Signed-off-by: Changli Gao <xiaosuo@gmail.com> > ---- > 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 <nhorman@tuxdriver.com> -- 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
From: Neil Horman <nhorman@tuxdriver.com> 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 <xiaosuo@gmail.com> ... > Looks good to me, thanks! > Acked-by: Neil Horman <nhorman@tuxdriver.com> Applied, thanks. -- 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 --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);
Signed-off-by: Changli Gao <xiaosuo@gmail.com> ---- net/core/drop_monitor.c | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) -- 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