From f8d2982959b6461e6bb47cadba33785af68dc258 Mon Sep 17 00:00:00 2001
From: Pavel Emelyanov <xemul@openvz.org>
Date: Sun, 13 Apr 2008 22:31:05 -0700
Subject: [PATCH] --- yaml --- r: 90661 b: refs/heads/master c:
 fc5f8580d31d52890f17526ea739b124bd4e56f4 h: refs/heads/master i:   90659:
 7fe37ef801679dea71a369308eccf13c6be3d991 v: v3

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

diff --git a/[refs] b/[refs]
index 22a66e077015..710c226b8433 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b9901a84c98fe27c6a598c0f3ec944a7f17a5f97
+refs/heads/master: fc5f8580d31d52890f17526ea739b124bd4e56f4
diff --git a/trunk/net/dccp/ipv4.c b/trunk/net/dccp/ipv4.c
index 66f860b1b916..b9974669edb4 100644
--- a/trunk/net/dccp/ipv4.c
+++ b/trunk/net/dccp/ipv4.c
@@ -952,6 +952,7 @@ static struct net_protocol dccp_v4_protocol = {
 	.handler	= dccp_v4_rcv,
 	.err_handler	= dccp_v4_err,
 	.no_policy	= 1,
+	.netns_ok	= 1,
 };
 
 static const struct proto_ops inet_dccp_ops = {