diff options
| author |   YOSHIFUJI Hideaki / 吉藤英明 <yoshfuji@linux-ipv6.org> | 2010-03-15 19:27:00 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2010-03-16 14:15:46 -0700 |
| commit | 0ba8c9ec25465cd0680b80c0f5836f558e3b972d (patch) | |
| tree | 28de185348a076c79e1e28196099a04515d9b700 /net | |
| parent | NET: netpoll, fix potential NULL ptr dereference (diff) | |
| download | linux-dev-0ba8c9ec25465cd0680b80c0f5836f558e3b972d.tar.xz linux-dev-0ba8c9ec25465cd0680b80c0f5836f558e3b972d.zip | |
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>
Diffstat (limited to 'net')
| -rw-r--r-- | net/bridge/br_multicast.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c index 398221e81be5..19618f25b4c6 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) |