From 24838320e6d52c6720a55b21b2f56d11cbc7149e Mon Sep 17 00:00:00 2001
From: Ben Hutchings <ben@decadent.org.uk>
Date: Mon, 9 Jan 2012 14:06:46 -0800
Subject: [PATCH] --- yaml --- r: 281973 b: refs/heads/master c:
 a8c1f65c79cbbb2f7da782d4c9d15639a9b94b27 h: refs/heads/master i:   281971:
 03ae958912370d37046a4d83ddb91a54e57c0ff2 v: v3

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

diff --git a/[refs] b/[refs]
index 25d23245e2b9..cd2d57c113fd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e5686ad82ca2aeed7a8f24ffca115c0b7478dec9
+refs/heads/master: a8c1f65c79cbbb2f7da782d4c9d15639a9b94b27
diff --git a/trunk/net/ipv4/igmp.c b/trunk/net/ipv4/igmp.c
index fa057d105bef..5104bc0bbdbe 100644
--- a/trunk/net/ipv4/igmp.c
+++ b/trunk/net/ipv4/igmp.c
@@ -880,6 +880,8 @@ static void igmp_heard_query(struct in_device *in_dev, struct sk_buff *skb,
 		 * to be intended in a v3 query.
 		 */
 		max_delay = IGMPV3_MRC(ih3->code)*(HZ/IGMP_TIMER_SCALE);
+		if (!max_delay)
+			max_delay = 1;	/* can't mod w/ 0 */
 	} else { /* v3 */
 		if (!pskb_may_pull(skb, sizeof(struct igmpv3_query)))
 			return;