From: Pavel Emelyanov <xemul@openvz.org>
Date: Wed, 16 Apr 2008 08:06:56 +0000 (-0700)
Subject: [IPIP]: Allow for IPPROTO_IPIP protocol in namespaces.
X-Git-Tag: v2.6.26-rc1~1138^2~46
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=4597a0ce0849eaa62fc9083c21943e0c434e4135;p=linux-2.6-omap-h63xx.git

[IPIP]: Allow for IPPROTO_IPIP protocol in namespaces.

This one was disabled by default for sanity.

Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/ipv4/tunnel4.c b/net/ipv4/tunnel4.c
index 978b3fd61e6..cc4cd0e518c 100644
--- a/net/ipv4/tunnel4.c
+++ b/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)