From a89a91e4731ef6f035061ba79716075864385d06 Mon Sep 17 00:00:00 2001
From: Bob Arendt <rda@rincon.com>
Date: Mon, 13 Sep 2010 12:56:03 -0700
Subject: [PATCH] --- yaml --- r: 210804 b: refs/heads/master c:
 7998156344b0d93de61ff8e5d75e96500e43a571 h: refs/heads/master v: v3

---
 [refs]                | 2 +-
 trunk/net/ipv4/igmp.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 504263a9b822..3547e585887b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3429769bc67c7a48b3c01b2452b32171b3450202
+refs/heads/master: 7998156344b0d93de61ff8e5d75e96500e43a571
diff --git a/trunk/net/ipv4/igmp.c b/trunk/net/ipv4/igmp.c
index a1ad0e7180d2..1fdcacd36ce7 100644
--- a/trunk/net/ipv4/igmp.c
+++ b/trunk/net/ipv4/igmp.c
@@ -834,7 +834,7 @@ static void igmp_heard_query(struct in_device *in_dev, struct sk_buff *skb,
 	int			mark = 0;
 
 
-	if (len == 8) {
+	if (len == 8 || IGMP_V2_SEEN(in_dev)) {
 		if (ih->code == 0) {
 			/* Alas, old v1 router presents here. */