From c721107dcebb14d4480796872fc85389da6f0805 Mon Sep 17 00:00:00 2001
From: Alexey Dobriyan <adobriyan@gmail.com>
Date: Thu, 25 Dec 2008 16:42:23 -0800
Subject: [PATCH] --- yaml --- r: 122856 b: refs/heads/master c:
 b4ee07df3d8121060200dbe1c6686a4e0682bee2 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 15aa20e7a28b..0be70421137f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cb5b04fe14394a93eb9a3523f5af9f77480a5a04
+refs/heads/master: b4ee07df3d8121060200dbe1c6686a4e0682bee2
diff --git a/trunk/net/ipv4/af_inet.c b/trunk/net/ipv4/af_inet.c
index 664ff0ee1c83..743f5542d65a 100644
--- a/trunk/net/ipv4/af_inet.c
+++ b/trunk/net/ipv4/af_inet.c
@@ -1402,6 +1402,7 @@ EXPORT_SYMBOL_GPL(snmp_mib_free);
 #ifdef CONFIG_IP_MULTICAST
 static struct net_protocol igmp_protocol = {
 	.handler =	igmp_rcv,
+	.netns_ok =	1,
 };
 #endif