From 406ce730c4be822957f21a3151537005cf347cbb Mon Sep 17 00:00:00 2001
From: Pavel Emelyanov <xemul@openvz.org>
Date: Wed, 16 Apr 2008 01:11:36 -0700
Subject: [PATCH] --- yaml --- r: 90770 b: refs/heads/master c:
 f96c148fd53a2a0dbb2d768895c7cf6951e35cc5 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index da49e853fd18..924c8a37bdb9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0b67eceb198b77045950011e12bf176a7c11ad98
+refs/heads/master: f96c148fd53a2a0dbb2d768895c7cf6951e35cc5
diff --git a/trunk/net/ipv4/ip_gre.c b/trunk/net/ipv4/ip_gre.c
index 7ff52628a73f..2ada033406de 100644
--- a/trunk/net/ipv4/ip_gre.c
+++ b/trunk/net/ipv4/ip_gre.c
@@ -1297,6 +1297,7 @@ static int ipgre_fb_tunnel_init(struct net_device *dev)
 static struct net_protocol ipgre_protocol = {
 	.handler	=	ipgre_rcv,
 	.err_handler	=	ipgre_err,
+	.netns_ok	=	1,
 };
 
 static void ipgre_destroy_tunnels(struct ipgre_net *ign)