From fa7eec83be40bca014e95b1cd143369a47d385a1 Mon Sep 17 00:00:00 2001
From: Pavel Emelyanov <xemul@openvz.org>
Date: Wed, 16 Apr 2008 01:06:56 -0700
Subject: [PATCH] --- yaml --- r: 90762 b: refs/heads/master c:
 4597a0ce0849eaa62fc9083c21943e0c434e4135 h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/net/ipv4/tunnel4.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index f2f44e8abb4c..9d1c614051ad 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0a826406d4adf0c4b7cd47f116cb8e8ef65b92a3
+refs/heads/master: 4597a0ce0849eaa62fc9083c21943e0c434e4135
diff --git a/trunk/net/ipv4/tunnel4.c b/trunk/net/ipv4/tunnel4.c
index 978b3fd61e65..cc4cd0e518cc 100644
--- a/trunk/net/ipv4/tunnel4.c
+++ b/trunk/net/ipv4/tunnel4.c
@@ -136,6 +136,7 @@ static struct net_protocol tunnel4_protocol = {
 	.handler	=	tunnel4_rcv,
 	.err_handler	=	tunnel4_err,
 	.no_policy	=	1,
+	.netns_ok	=	1,
 };
 
 #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)