summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYOSHIFUJI Hideaki / 吉藤英明 <yoshfuji@linux-ipv6.org>2010-03-15 19:27:00 +0000
committerDavid S. Miller <davem@davemloft.net>2010-03-16 14:15:46 -0700
commit0ba8c9ec25465cd0680b80c0f5836f558e3b972d (patch)
tree28de185348a076c79e1e28196099a04515d9b700
parent21edbb223ed2af88b090e7945af7d91d672e3aa6 (diff)
downloadop-kernel-dev-0ba8c9ec25465cd0680b80c0f5836f558e3b972d.zip
op-kernel-dev-0ba8c9ec25465cd0680b80c0f5836f558e3b972d.tar.gz
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>
-rw-r--r--net/bridge/br_multicast.c4
1 files changed, 2 insertions, 2 deletions
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 @@ static int br_multicast_query(struct net_bridge *br,
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)
OpenPOWER on IntegriCloud