From 5e7637d99f5a10dc57d3cf86b921ad8574ef4831 Mon Sep 17 00:00:00 2001
From: "Denis V. Lunev" <den@openvz.org>
Date: Mon, 24 Mar 2008 15:32:09 -0700
Subject: [PATCH] --- yaml --- r: 90271 b: refs/heads/master c:
 0be43f82c4f4c4a999b53cf794513f7f1a4ed7f3 h: refs/heads/master i:   90269:
 4196d2940b4849976b225d83d13852115d345ec3   90267:
 e1ca93342aaba201c913002fad8d482776574864   90263:
 1f85673ac2cf791f56c92a320466750d54c3ec0e   90255:
 2d3c62dffdb6df9d3b97a2ed48b908b4c56a1ba5   90239:
 7dbee9e066e51189b9b540e92341ae24113c4388 v: v3

---
 [refs]                     | 2 +-
 trunk/net/netfilter/core.c | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 6f179b867dd4..8c23f0d12c44 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 05cf89d40c85e622dac20e44713168767be5c520
+refs/heads/master: 0be43f82c4f4c4a999b53cf794513f7f1a4ed7f3
diff --git a/trunk/net/netfilter/core.c b/trunk/net/netfilter/core.c
index c4065b8f9a95..ec05684c56d7 100644
--- a/trunk/net/netfilter/core.c
+++ b/trunk/net/netfilter/core.c
@@ -165,6 +165,14 @@ int nf_hook_slow(int pf, unsigned int hook, struct sk_buff *skb,
 	unsigned int verdict;
 	int ret = 0;
 
+#ifdef CONFIG_NET_NS
+	struct net *net;
+
+	net = indev == NULL ? outdev->nd_net : indev->nd_net;
+	if (net != &init_net)
+		return 1;
+#endif
+
 	/* We may already have this, but read-locks nest anyway */
 	rcu_read_lock();