summaryrefslogtreecommitdiffstats
path: root/net/core
diff options
context:
space:
mode:
authorJosef 'Jeff' Sipek2007-05-07 09:33:18 +0200
committerDavid S. Miller2007-05-07 09:33:18 +0200
commit2396a22e0989df6038996506bfbf7a57f116c299 (patch)
tree78457223b226abfd52d059cdc13797d06af34cdd /net/core
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6 (diff)
downloadkernel-qcow2-linux-2396a22e0989df6038996506bfbf7a57f116c299.tar.gz
kernel-qcow2-linux-2396a22e0989df6038996506bfbf7a57f116c299.tar.xz
kernel-qcow2-linux-2396a22e0989df6038996506bfbf7a57f116c299.zip
[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/core')
-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)
out:
return rc;
out_softnet:
- proc_net_remove("softnet_stat");
-out_dev2:
proc_net_remove("ptype");
+out_dev2:
+ proc_net_remove("softnet_stat");
out_dev:
proc_net_remove("dev");
goto out;