From 4acc2a59775e058e3ceff9ee26479e0b72a59148 Mon Sep 17 00:00:00 2001
From: Jean Sacren <sakiwit@gmail.com>
Date: Sun, 19 Aug 2012 15:11:32 +0000
Subject: [PATCH] --- yaml --- r: 327583 b: refs/heads/master c:
 90efbed18a30d78145419cdbd44f9ec152efeb16 h: refs/heads/master i:   327581:
 d0f86b88a2b38f1888fb375589473abb9e2abe95   327579:
 965bd51d7df409db22772dc529248f0f2ee3992e   327575:
 1c2095266f6e2c97dc2e95c809290cc1944163e6   327567:
 018acc282bfbb8830e0b17170247f5cbcb47b31f   327551:
 6d63e39ebd9661bcc89950737091a2c1fb8fe2dd v: v3

---
 [refs]                                    | 2 +-
 trunk/net/ipv4/netfilter/iptable_filter.c | 6 +-----
 trunk/net/ipv4/netfilter/iptable_mangle.c | 6 +-----
 trunk/net/ipv4/netfilter/iptable_raw.c    | 6 +-----
 4 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/[refs] b/[refs]
index 0009d2a45563..d00cb4be14e3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6705e86724f1ac83394592be7dbfc0c07ac25aa2
+refs/heads/master: 90efbed18a30d78145419cdbd44f9ec152efeb16
diff --git a/trunk/net/ipv4/netfilter/iptable_filter.c b/trunk/net/ipv4/netfilter/iptable_filter.c
index d20cc374025c..6b3da5cf54e9 100644
--- a/trunk/net/ipv4/netfilter/iptable_filter.c
+++ b/trunk/net/ipv4/netfilter/iptable_filter.c
@@ -94,14 +94,10 @@ static int __init iptable_filter_init(void)
 	filter_ops = xt_hook_link(&packet_filter, iptable_filter_hook);
 	if (IS_ERR(filter_ops)) {
 		ret = PTR_ERR(filter_ops);
-		goto cleanup_table;
+		unregister_pernet_subsys(&iptable_filter_net_ops);
 	}
 
 	return ret;
-
- cleanup_table:
-	unregister_pernet_subsys(&iptable_filter_net_ops);
-	return ret;
 }
 
 static void __exit iptable_filter_fini(void)
diff --git a/trunk/net/ipv4/netfilter/iptable_mangle.c b/trunk/net/ipv4/netfilter/iptable_mangle.c
index f38b94288cf5..85d88f206447 100644
--- a/trunk/net/ipv4/netfilter/iptable_mangle.c
+++ b/trunk/net/ipv4/netfilter/iptable_mangle.c
@@ -129,14 +129,10 @@ static int __init iptable_mangle_init(void)
 	mangle_ops = xt_hook_link(&packet_mangler, iptable_mangle_hook);
 	if (IS_ERR(mangle_ops)) {
 		ret = PTR_ERR(mangle_ops);
-		goto cleanup_table;
+		unregister_pernet_subsys(&iptable_mangle_net_ops);
 	}
 
 	return ret;
-
- cleanup_table:
-	unregister_pernet_subsys(&iptable_mangle_net_ops);
-	return ret;
 }
 
 static void __exit iptable_mangle_fini(void)
diff --git a/trunk/net/ipv4/netfilter/iptable_raw.c b/trunk/net/ipv4/netfilter/iptable_raw.c
index b21e2191e2f5..03d9696d3c6e 100644
--- a/trunk/net/ipv4/netfilter/iptable_raw.c
+++ b/trunk/net/ipv4/netfilter/iptable_raw.c
@@ -73,14 +73,10 @@ static int __init iptable_raw_init(void)
 	rawtable_ops = xt_hook_link(&packet_raw, iptable_raw_hook);
 	if (IS_ERR(rawtable_ops)) {
 		ret = PTR_ERR(rawtable_ops);
-		goto cleanup_table;
+		unregister_pernet_subsys(&iptable_raw_net_ops);
 	}
 
 	return ret;
-
- cleanup_table:
-	unregister_pernet_subsys(&iptable_raw_net_ops);
-	return ret;
 }
 
 static void __exit iptable_raw_fini(void)