aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorPavel Emelyanov <xemul@openvz.org>2008-04-16 04:06:56 -0400
committerDavid S. Miller <davem@davemloft.net>2008-04-16 04:06:56 -0400
commit4597a0ce0849eaa62fc9083c21943e0c434e4135 (patch)
tree2562912e41e53a95c6fb55deaa6c0b6571591a82 /net
parent0a826406d4adf0c4b7cd47f116cb8e8ef65b92a3 (diff)
[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>
Diffstat (limited to 'net')
-rw-r--r--net/ipv4/tunnel4.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv4/tunnel4.c b/net/ipv4/tunnel4.c
index 978b3fd61e65..cc4cd0e518cc 100644
--- a/net/ipv4/tunnel4.c
+++ b/net/ipv4/tunnel4.c
@@ -136,6 +136,7 @@ static struct net_protocol tunnel4_protocol = {
136 .handler = tunnel4_rcv, 136 .handler = tunnel4_rcv,
137 .err_handler = tunnel4_err, 137 .err_handler = tunnel4_err,
138 .no_policy = 1, 138 .no_policy = 1,
139 .netns_ok = 1,
139}; 140};
140 141
141#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) 142#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)