2 files changed, 9 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
diff --git a/net/ipv6/mcast.c b/net/ipv6/mcast.c
index f15e04ad026e..fd939da090c4 100644
--- a/net/ipv6/mcast.c
+++ b/net/ipv6/mcast.c
@@ -1231,6 +1231,11 @@ int igmp6_event_report(struct sk_buff *skb)
         if (skb->pkt_type == PACKET_LOOPBACK)
                 return 0;
 
+        /* send our report if the MC router may not have heard this report */
+        if (skb->pkt_type != PACKET_MULTICAST &&
+            skb->pkt_type != PACKET_BROADCAST)
+                return 0;
+
         if (!pskb_may_pull(skb, sizeof(struct in6_addr)))
                 return -EINVAL;