diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-03 10:09:38 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-03 10:09:38 +0300 |
| commit | b3c6aeb3ce26b286769d2deafec47d218c83dd09 (patch) | |
| tree | 06378a021f5873003a07f0388aa0cb6e81a32c19 /net/ipv4/igmp.c | |
| parent | af2eb17bac41a116b73d85b3fb160405c32bea5b (diff) | |
| parent | af1afe866297448ad8a1da99fa8a6af86c43c909 (diff) | |
| download | linux-b3c6aeb3ce26b286769d2deafec47d218c83dd09.tar.xz | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/ipv4/igmp.c')
| -rw-r--r-- | net/ipv4/igmp.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/ipv4/igmp.c b/net/ipv4/igmp.c index c04607b49212..4a195c724f01 100644 --- a/net/ipv4/igmp.c +++ b/net/ipv4/igmp.c @@ -897,7 +897,10 @@ int igmp_rcv(struct sk_buff *skb) /* Is it our report looped back? */ if (((struct rtable*)skb->dst)->fl.iif == 0) break; - igmp_heard_report(in_dev, ih->group); + /* don't rely on MC router hearing unicast reports */ + if (skb->pkt_type == PACKET_MULTICAST || + skb->pkt_type == PACKET_BROADCAST) + igmp_heard_report(in_dev, ih->group); break; case IGMP_PIM: #ifdef CONFIG_IP_PIMSM_V1 |