From ba5725c7c198f49edfea1559300f9f92dd89efd2 Mon Sep 17 00:00:00 2001 From: WANG Cong Date: Sun, 22 May 2011 00:52:08 +0000 Subject: [PATCH] --- yaml --- r: 247973 b: refs/heads/master c: ce14f8946a294ffa741ec29558a1c7e455cecd3b h: refs/heads/master i: 247971: 6b9db5f4096e8d3d6ca5203a5c23a556db41d30d v: v3 --- [refs] | 2 +- trunk/net/core/pktgen.c | 19 ++++++++++++------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index c554bca6ca74..fd15ae4e3556 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 68d5ac2ed6180567407e4187e206df3ba6466373 +refs/heads/master: ce14f8946a294ffa741ec29558a1c7e455cecd3b diff --git a/trunk/net/core/pktgen.c b/trunk/net/core/pktgen.c index 3b85c0dffa61..f76079cd750c 100644 --- a/trunk/net/core/pktgen.c +++ b/trunk/net/core/pktgen.c @@ -3707,6 +3707,7 @@ static int __init pg_init(void) { int cpu; struct proc_dir_entry *pe; + int ret = 0; pr_info("%s", version); @@ -3717,11 +3718,10 @@ static int __init pg_init(void) pe = proc_create(PGCTRL, 0600, pg_proc_dir, &pktgen_fops); if (pe == NULL) { pr_err("ERROR: cannot create %s procfs entry\n", PGCTRL); - proc_net_remove(&init_net, PG_PROC_DIR); - return -EINVAL; + ret = -EINVAL; + goto remove_dir; } - /* Register us to receive netdevice events */ register_netdevice_notifier(&pktgen_notifier_block); for_each_online_cpu(cpu) { @@ -3735,13 +3735,18 @@ static int __init pg_init(void) if (list_empty(&pktgen_threads)) { pr_err("ERROR: Initialization failed for all threads\n"); - unregister_netdevice_notifier(&pktgen_notifier_block); - remove_proc_entry(PGCTRL, pg_proc_dir); - proc_net_remove(&init_net, PG_PROC_DIR); - return -ENODEV; + ret = -ENODEV; + goto unregister; } return 0; + + unregister: + unregister_netdevice_notifier(&pktgen_notifier_block); + remove_proc_entry(PGCTRL, pg_proc_dir); + remove_dir: + proc_net_remove(&init_net, PG_PROC_DIR); + return ret; } static void __exit pg_cleanup(void)