projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
21edbb2
)
bridge br_multicast: Fix handling of Max Response Code in IGMPv3 message.
author
YOSHIFUJI Hideaki / 吉藤英明
<yoshfuji@linux-ipv6.org>
Mon, 15 Mar 2010 19:27:00 +0000
(19:27 +0000)
committer
David S. Miller
<davem@davemloft.net>
Tue, 16 Mar 2010 21:15:46 +0000
(14:15 -0700)
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/bridge/br_multicast.c
patch
|
blob
|
history
diff --git
a/net/bridge/br_multicast.c
b/net/bridge/br_multicast.c
index 398221e81be50354318575ab33bbf6486d5fc465..19618f25b4c6e315b15859896afec93e1ad0ec5a 100644
(file)
--- 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)