From 86aafef530848d69234b2c3db7300fa3c0da60d3 Mon Sep 17 00:00:00 2001
From: "Denis V. Lunev" <den@openvz.org>
Date: Mon, 24 Mar 2008 15:34:06 -0700
Subject: [PATCH] --- yaml --- r: 90274 b: refs/heads/master c:
 92f1fecb45ef97acae94463302f79228a4b454d9 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 91bd7e749c1e..1f51b0be712a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2342fd7e146f05edeb13feb03490c13a1bdab2e0
+refs/heads/master: 92f1fecb45ef97acae94463302f79228a4b454d9
diff --git a/trunk/net/ipv4/af_inet.c b/trunk/net/ipv4/af_inet.c
index 39ddb84b1b78..06cfb0bed631 100644
--- a/trunk/net/ipv4/af_inet.c
+++ b/trunk/net/ipv4/af_inet.c
@@ -1302,17 +1302,20 @@ static struct net_protocol tcp_protocol = {
 	.gso_send_check = tcp_v4_gso_send_check,
 	.gso_segment =	tcp_tso_segment,
 	.no_policy =	1,
+	.netns_ok =	1,
 };
 
 static struct net_protocol udp_protocol = {
 	.handler =	udp_rcv,
 	.err_handler =	udp_err,
 	.no_policy =	1,
+	.netns_ok =	1,
 };
 
 static struct net_protocol icmp_protocol = {
 	.handler =	icmp_rcv,
 	.no_policy =	1,
+	.netns_ok =	1,
 };
 
 static int __init init_ipv4_mibs(void)
diff --git a/trunk/net/ipv4/udplite.c b/trunk/net/ipv4/udplite.c
index ddf4cc432796..53f3ed496328 100644
--- a/trunk/net/ipv4/udplite.c
+++ b/trunk/net/ipv4/udplite.c
@@ -31,6 +31,7 @@ static	struct net_protocol udplite_protocol = {
 	.handler	= udplite_rcv,
 	.err_handler	= udplite_err,
 	.no_policy	= 1,
+	.netns_ok	= 1,
 };
 
 DEFINE_PROTO_INUSE(udplite)