aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorJosef 'Jeff' Sipek <jsipek@cs.sunysb.edu>2007-05-07 03:33:18 -0400
committerDavid S. Miller <davem@davemloft.net>2007-05-07 03:33:18 -0400
commit2396a22e0989df6038996506bfbf7a57f116c299 (patch)
tree78457223b226abfd52d059cdc13797d06af34cdd /net
parentd5bb306b42e39ffecaf85d1f9d04a3b5d9a97c86 (diff)
[NET] net/core: Fix error handling
Upon failure to register "ptype" procfs entry, "softnet_stat" was not removed, and an incorrect attempt was made to remove the "ptype" entry. Signed-off-by: Josef 'Jeff' Sipek <jsipek@cs.sunysb.edu> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/core/dev.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/core/dev.c b/net/core/dev.c
index f27d4ab181e6..4317c1be4d3f 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -2377,9 +2377,9 @@ static int __init dev_proc_init(void)
2377out: 2377out:
2378 return rc; 2378 return rc;
2379out_softnet: 2379out_softnet:
2380 proc_net_remove("softnet_stat");
2381out_dev2:
2382 proc_net_remove("ptype"); 2380 proc_net_remove("ptype");
2381out_dev2:
2382 proc_net_remove("softnet_stat");
2383out_dev: 2383out_dev:
2384 proc_net_remove("dev"); 2384 proc_net_remove("dev");
2385 goto out; 2385 goto out;