From: Josef 'Jeff' Sipek <jsipek@cs.sunysb.edu>
Date: Mon, 7 May 2007 07:33:18 +0000 (-0700)
Subject: [NET] net/core: Fix error handling
X-Git-Tag: v2.6.22-rc1~822^2~1
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2396a22e0989df6038996506bfbf7a57f116c299;p=linux-2.6

[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>
---

diff --git a/net/core/dev.c b/net/core/dev.c
index f27d4ab181..4317c1be4d 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;