commit 0ba8c9ec25465cd0680b80c0f5836f558e3b972d
author YOSHIFUJI Hideaki / 吉藤英明 <yoshfuji@linux-ipv6.org> Mon Mar 15 19:27:00 2010 +0000
committer David S. Miller <davem@davemloft.net> Tue Mar 16 14:15:46 2010 -0700
tree 28de185348a076c79e1e28196099a04515d9b700
parent 21edbb223ed2af88b090e7945af7d91d672e3aa6

bridge br_multicast: Fix handling of Max Response Code in IGMPv3 message.

Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

net/bridge/br_multicast.c

diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
index 398221e..19618f2 100644
--- a/net/bridge/br_multicast.c
+++ b/net/bridge/br_multicast.c
@@ -852,8 +852,8 @@
 		if (ih3->nsrcs)
 			goto out;
 
-		max_delay = ih3->code ? 1 :
-			    IGMPV3_MRC(ih3->code) * (HZ / IGMP_TIMER_SCALE);
+		max_delay = ih3->code ?
+			    IGMPV3_MRC(ih3->code) * (HZ / IGMP_TIMER_SCALE) : 1;
 	}
 
 	if (!group)