Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2 files changed, 7 insertions, 5 deletions

diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
index eaa150c33b..d368cf2490 100644
--- a/net/ipv4/af_inet.c
+++ b/net/ipv4/af_inet.c
@@ -228,13 +228,14 @@ static int inet_create(struct socket *sock, int protocol)
         unsigned char answer_flags;
         char answer_no_check;
         int try_loading_module = 0;
-        int err = -ESOCKTNOSUPPORT;
+        int err;
 
         sock->state = SS_UNCONNECTED;
 
         /* Look for the requested type/protocol pair. */
         answer = NULL;
 lookup_protocol:
+        err = -ESOCKTNOSUPPORT;
         rcu_read_lock();
         list_for_each_rcu(p, &inetsw[sock->type]) {
                 answer = list_entry(p, struct inet_protosw, list);
@@ -252,6 +253,7 @@ lookup_protocol:
                         if (IPPROTO_IP == answer->protocol)
                                 break;
                 }
+                err = -EPROTONOSUPPORT;
                 answer = NULL;
         }
 
@@ -280,9 +282,6 @@ lookup_protocol:
         err = -EPERM;
         if (answer->capability > 0 && !capable(answer->capability))
                 goto out_rcu_unlock;
-        err = -EPROTONOSUPPORT;
-        if (!protocol)
-                goto out_rcu_unlock;
 
         sock->ops = answer->ops;
         answer_prot = answer->prot;
diff --git a/net/ipv4/igmp.c b/net/ipv4/igmp.c
index c04607b492..4a195c724f 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