diff options
| author | Clark Williams <williams@redhat.com> | 2012-01-16 13:03:35 -0600 |
|---|---|---|
| committer | Clark Williams <williams@redhat.com> | 2012-01-16 13:03:35 -0600 |
| commit | 40a54e2e116950a27dbd0a46a7b1ff8e982de477 (patch) | |
| tree | 70b9106eb01e81abbdb78485f32a521c5d3cb0a5 /net | |
| parent | 3d61884faa7b609f470fe0dd7b5b1ddeea5b3d5c (diff) | |
| parent | b8ed9e5b8c34dc9fb1882669e45b21e3d0194881 (diff) | |
Merge commit 'v3.2.1' into rt-3.2.1-rt10
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv4/igmp.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/ipv4/igmp.c b/net/ipv4/igmp.c index b2ca095cb9da..c3cc64c6f715 100644 --- a/net/ipv4/igmp.c +++ b/net/ipv4/igmp.c @@ -875,6 +875,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; |