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

6 files changed, 52 insertions, 25 deletions

diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
index eaa150c33b04..d368cf249000 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 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/af_inet6.c b/net/ipv6/af_inet6.c
index c63b8ce0e1b5..d9546380fa04 100644
--- a/net/ipv6/af_inet6.c
+++ b/net/ipv6/af_inet6.c
@@ -92,10 +92,13 @@ static int inet6_create(struct socket *sock, int protocol)
         struct proto *answer_prot;
         unsigned char answer_flags;
         char answer_no_check;
-        int rc;
+        int try_loading_module = 0;
+        int err;
 
         /* Look for the requested type/protocol pair. */
         answer = NULL;
+lookup_protocol:
+        err = -ESOCKTNOSUPPORT;
         rcu_read_lock();
         list_for_each_rcu(p, &inetsw6[sock->type]) {
                 answer = list_entry(p, struct inet_protosw, list);
@@ -113,21 +116,37 @@ static int inet6_create(struct socket *sock, int protocol)
                         if (IPPROTO_IP == answer->protocol)
                                 break;
                 }
+                err = -EPROTONOSUPPORT;
                 answer = NULL;
         }
 
-        rc = -ESOCKTNOSUPPORT;
-        if (!answer)
-                goto out_rcu_unlock;
-        rc = -EPERM;
+        if (!answer) {
+                if (try_loading_module < 2) {
+                        rcu_read_unlock();
+                        /*
+                         * Be more specific, e.g. net-pf-10-proto-132-type-1
+                         * (net-pf-PF_INET6-proto-IPPROTO_SCTP-type-SOCK_STREAM)
+                         */
+                        if (++try_loading_module == 1)
+                                request_module("net-pf-%d-proto-%d-type-%d",
+                                                PF_INET6, protocol, sock->type);
+                        /*
+                         * Fall back to generic, e.g. net-pf-10-proto-132
+                         * (net-pf-PF_INET6-proto-IPPROTO_SCTP)
+                         */
+                        else
+                                request_module("net-pf-%d-proto-%d",
+                                                PF_INET6, protocol);
+                        goto lookup_protocol;
+                } else
+                        goto out_rcu_unlock;
+        }
+
+        err = -EPERM;
         if (answer->capability > 0 && !capable(answer->capability))
                 goto out_rcu_unlock;
-        rc = -EPROTONOSUPPORT;
-        if (!protocol)
-                goto out_rcu_unlock;
 
         sock->ops = answer->ops;
-
         answer_prot = answer->prot;
         answer_no_check = answer->no_check;
         answer_flags = answer->flags;
@@ -135,14 +154,14 @@ static int inet6_create(struct socket *sock, int protocol)
 
         BUG_TRAP(answer_prot->slab != NULL);
 
-        rc = -ENOBUFS;
+        err = -ENOBUFS;
         sk = sk_alloc(PF_INET6, GFP_KERNEL, answer_prot, 1);
         if (sk == NULL)
                 goto out;
 
         sock_init_data(sock, sk);
 
-        rc = 0;
+        err = 0;
         sk->sk_no_check = answer_no_check;
         if (INET_PROTOSW_REUSE & answer_flags)
                 sk->sk_reuse = 1;
@@ -202,14 +221,14 @@ static int inet6_create(struct socket *sock, int protocol)
                 sk->sk_prot->hash(sk);
         }
         if (sk->sk_prot->init) {
-                rc = sk->sk_prot->init(sk);
-                if (rc) {
+                err = sk->sk_prot->init(sk);
+                if (err) {
                         sk_common_release(sk);
                         goto out;
                 }
         }
 out:
-        return rc;
+        return err;
 out_rcu_unlock:
         rcu_read_unlock();
         goto out;
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;
 
diff --git a/net/sctp/socket.c b/net/sctp/socket.c
index abab81f3818f..d890dfa8818f 100644
--- a/net/sctp/socket.c
+++ b/net/sctp/socket.c
@@ -4743,11 +4743,6 @@ static struct sk_buff *sctp_skb_recv_datagram(struct sock *sk, int flags,
         struct sk_buff *skb;
         long timeo;
 
-        /* Caller is allowed not to check sk->sk_err before calling.  */
-        error = sock_error(sk);
-        if (error)
-                goto no_packet;
-
         timeo = sock_rcvtimeo(sk, noblock);
 
         SCTP_DEBUG_PRINTK("Timeout: timeo: %ld, MAX: %ld.\n",
@@ -4774,6 +4769,11 @@ static struct sk_buff *sctp_skb_recv_datagram(struct sock *sk, int flags,
                 if (skb)
                         return skb;
 
+                /* Caller is allowed not to check sk->sk_err before calling. */
+                error = sock_error(sk);
+                if (error)
+                        goto no_packet;
+
                 if (sk->sk_shutdown & RCV_SHUTDOWN)
                         break;
 
diff --git a/net/sctp/transport.c b/net/sctp/transport.c
index 6bc27200e6ca..268ddaf2dc0f 100644
--- a/net/sctp/transport.c
+++ b/net/sctp/transport.c
@@ -261,7 +261,8 @@ void sctp_transport_route(struct sctp_transport *transport,
                  * association's active path for getsockname().
                  */ 
                 if (asoc && (transport == asoc->peer.active_path))
-                        af->to_sk_saddr(&transport->saddr, asoc->base.sk);
+                        opt->pf->af->to_sk_saddr(&transport->saddr,
+                                                 asoc->base.sk);
         } else
                 transport->pmtu = SCTP_DEFAULT_MAXSEGMENT;
 }