Merge remote-tracking branch 'wireless-next/master' into mac80211-next

9 files changed, 43 insertions, 62 deletions

diff --git a/net/sctp/associola.c b/net/sctp/associola.c
index cef509985192..68a27f9796d2 100644
--- a/net/sctp/associola.c
+++ b/net/sctp/associola.c
@@ -602,7 +602,7 @@ void sctp_assoc_rm_peer(struct sctp_association *asoc,
 
                 /* Start a T3 timer here in case it wasn't running so
                  * that these migrated packets have a chance to get
-                 * retrnasmitted.
+                 * retransmitted.
                  */
                 if (!timer_pending(&active->T3_rtx_timer))
                         if (!mod_timer(&active->T3_rtx_timer,
@@ -665,7 +665,7 @@ struct sctp_transport *sctp_assoc_add_peer(struct sctp_association *asoc,
         /* Set the path max_retrans.  */
         peer->pathmaxrxt = asoc->pathmaxrxt;
 
-        /* And the partial failure retrnas threshold */
+        /* And the partial failure retrans threshold */
         peer->pf_retrans = asoc->pf_retrans;
 
         /* Initialize the peer's SACK delay timeout based on the
@@ -907,8 +907,8 @@ void sctp_assoc_control_transport(struct sctp_association *asoc,
                 if (!first || t->last_time_heard > first->last_time_heard) {
                         second = first;
                         first = t;
-                }
-                if (!second || t->last_time_heard > second->last_time_heard)
+                } else if (!second ||
+                           t->last_time_heard > second->last_time_heard)
                         second = t;
         }
 
@@ -929,6 +929,8 @@ void sctp_assoc_control_transport(struct sctp_association *asoc,
                 first = asoc->peer.primary_path;
         }
 
+        if (!second)
+                second = first;
         /* If we failed to find a usable transport, just camp on the
          * primary, even if it is inactive.
          */
diff --git a/net/sctp/auth.c b/net/sctp/auth.c
index 8c4fa5dec824..46b5977978a1 100644
--- a/net/sctp/auth.c
+++ b/net/sctp/auth.c
@@ -539,18 +539,14 @@ struct sctp_hmac *sctp_auth_asoc_get_hmac(const struct sctp_association *asoc)
         for (i = 0; i < n_elt; i++) {
                 id = ntohs(hmacs->hmac_ids[i]);
 
-                /* Check the id is in the supported range */
-                if (id > SCTP_AUTH_HMAC_ID_MAX) {
-                        id = 0;
-                        continue;
-                }
-
-                /* See is we support the id.  Supported IDs have name and
-                 * length fields set, so that we can allocated and use
+                /* Check the id is in the supported range. And
+                 * see if we support the id.  Supported IDs have name and
+                 * length fields set, so that we can allocate and use
                  * them.  We can safely just check for name, for without the
                  * name, we can't allocate the TFM.
                  */
-                if (!sctp_hmac_list[id].hmac_name) {
+                if (id > SCTP_AUTH_HMAC_ID_MAX ||
+                    !sctp_hmac_list[id].hmac_name) {
                         id = 0;
                         continue;
                 }
diff --git a/net/sctp/chunk.c b/net/sctp/chunk.c
index 7bd5ed4a8657..f2044fcb9dd1 100644
--- a/net/sctp/chunk.c
+++ b/net/sctp/chunk.c
@@ -201,7 +201,7 @@ struct sctp_datamsg *sctp_datamsg_from_user(struct sctp_association *asoc,
 
         max = asoc->frag_point;
         /* If the the peer requested that we authenticate DATA chunks
-         * we need to accound for bundling of the AUTH chunks along with
+         * we need to account for bundling of the AUTH chunks along with
          * DATA.
          */
         if (sctp_auth_send_cid(SCTP_CID_DATA, asoc)) {
diff --git a/net/sctp/ipv6.c b/net/sctp/ipv6.c
index e7b2d4fe2b6a..7567e6f1a920 100644
--- a/net/sctp/ipv6.c
+++ b/net/sctp/ipv6.c
@@ -279,7 +279,9 @@ static void sctp_v6_get_dst(struct sctp_transport *t, union sctp_addr *saddr,
                 sctp_v6_to_addr(&dst_saddr, &fl6->saddr, htons(bp->port));
                 rcu_read_lock();
                 list_for_each_entry_rcu(laddr, &bp->address_list, list) {
-                        if (!laddr->valid || (laddr->state != SCTP_ADDR_SRC))
+                        if (!laddr->valid || laddr->state == SCTP_ADDR_DEL ||
+                            (laddr->state != SCTP_ADDR_SRC &&
+                             !asoc->src_out_of_asoc_ok))
                                 continue;
 
                         /* Do not compare against v4 addrs */
@@ -426,20 +428,20 @@ static void sctp_v6_from_sk(union sctp_addr *addr, struct sock *sk)
 {
         addr->v6.sin6_family = AF_INET6;
         addr->v6.sin6_port = 0;
-        addr->v6.sin6_addr = inet6_sk(sk)->rcv_saddr;
+        addr->v6.sin6_addr = sk->sk_v6_rcv_saddr;
 }
 
 /* Initialize sk->sk_rcv_saddr from sctp_addr. */
 static void sctp_v6_to_sk_saddr(union sctp_addr *addr, struct sock *sk)
 {
         if (addr->sa.sa_family == AF_INET && sctp_sk(sk)->v4mapped) {
-                inet6_sk(sk)->rcv_saddr.s6_addr32[0] = 0;
-                inet6_sk(sk)->rcv_saddr.s6_addr32[1] = 0;
-                inet6_sk(sk)->rcv_saddr.s6_addr32[2] = htonl(0x0000ffff);
-                inet6_sk(sk)->rcv_saddr.s6_addr32[3] =
+                sk->sk_v6_rcv_saddr.s6_addr32[0] = 0;
+                sk->sk_v6_rcv_saddr.s6_addr32[1] = 0;
+                sk->sk_v6_rcv_saddr.s6_addr32[2] = htonl(0x0000ffff);
+                sk->sk_v6_rcv_saddr.s6_addr32[3] =
                         addr->v4.sin_addr.s_addr;
         } else {
-                inet6_sk(sk)->rcv_saddr = addr->v6.sin6_addr;
+                sk->sk_v6_rcv_saddr = addr->v6.sin6_addr;
         }
 }
 
@@ -447,12 +449,12 @@ static void sctp_v6_to_sk_saddr(union sctp_addr *addr, struct sock *sk)
 static void sctp_v6_to_sk_daddr(union sctp_addr *addr, struct sock *sk)
 {
         if (addr->sa.sa_family == AF_INET && sctp_sk(sk)->v4mapped) {
-                inet6_sk(sk)->daddr.s6_addr32[0] = 0;
-                inet6_sk(sk)->daddr.s6_addr32[1] = 0;
-                inet6_sk(sk)->daddr.s6_addr32[2] = htonl(0x0000ffff);
-                inet6_sk(sk)->daddr.s6_addr32[3] = addr->v4.sin_addr.s_addr;
+                sk->sk_v6_daddr.s6_addr32[0] = 0;
+                sk->sk_v6_daddr.s6_addr32[1] = 0;
+                sk->sk_v6_daddr.s6_addr32[2] = htonl(0x0000ffff);
+                sk->sk_v6_daddr.s6_addr32[3] = addr->v4.sin_addr.s_addr;
         } else {
-                inet6_sk(sk)->daddr = addr->v6.sin6_addr;
+                sk->sk_v6_daddr = addr->v6.sin6_addr;
         }
 }
 
diff --git a/net/sctp/objcnt.c b/net/sctp/objcnt.c
index 5ea573b37648..647396baa56f 100644
--- a/net/sctp/objcnt.c
+++ b/net/sctp/objcnt.c
@@ -79,12 +79,13 @@ static sctp_dbg_objcnt_entry_t sctp_dbg_objcnt[] = {
  */
 static int sctp_objcnt_seq_show(struct seq_file *seq, void *v)
 {
-        int i, len;
+        int i;
 
         i = (int)*(loff_t *)v;
-        seq_printf(seq, "%s: %d%n", sctp_dbg_objcnt[i].label,
-                                atomic_read(sctp_dbg_objcnt[i].counter), &len);
-        seq_printf(seq, "%*s\n", 127 - len, "");
+        seq_setwidth(seq, 127);
+        seq_printf(seq, "%s: %d", sctp_dbg_objcnt[i].label,
+                                atomic_read(sctp_dbg_objcnt[i].counter));
+        seq_pad(seq, '\n');
         return 0;
 }
 
diff --git a/net/sctp/output.c b/net/sctp/output.c
index 0ac3a65daccb..e650978daf27 100644
--- a/net/sctp/output.c
+++ b/net/sctp/output.c
@@ -390,7 +390,6 @@ int sctp_packet_transmit(struct sctp_packet *packet)
         __u8 has_data = 0;
         struct dst_entry *dst = tp->dst;
         unsigned char *auth = NULL;     /* pointer to auth in skb data */
-        __u32 cksum_buf_len = sizeof(struct sctphdr);
 
         pr_debug("%s: packet:%p\n", __func__, packet);
 
@@ -493,7 +492,6 @@ int sctp_packet_transmit(struct sctp_packet *packet)
                 if (chunk == packet->auth)
                         auth = skb_tail_pointer(nskb);
 
-                cksum_buf_len += chunk->skb->len;
                 memcpy(skb_put(nskb, chunk->skb->len),
                                chunk->skb->data, chunk->skb->len);
 
@@ -536,13 +534,9 @@ int sctp_packet_transmit(struct sctp_packet *packet)
          * by CRC32-C as described in <draft-ietf-tsvwg-sctpcsum-02.txt>.
          */
         if (!sctp_checksum_disable) {
-                if (!(dst->dev->features & NETIF_F_SCTP_CSUM)) {
-                        __u32 crc32 = sctp_start_cksum((__u8 *)sh, cksum_buf_len);
-
-                        /* 3) Put the resultant value into the checksum field in the
-                         *    common header, and leave the rest of the bits unchanged.
-                         */
-                        sh->checksum = sctp_end_cksum(crc32);
+                if (!(dst->dev->features & NETIF_F_SCTP_CSUM) ||
+                    (dst_xfrm(dst) != NULL) || packet->ipfragok) {
+                        sh->checksum = sctp_compute_cksum(nskb, 0);
                 } else {
                         /* no need to seed pseudo checksum for SCTP */
                         nskb->ip_summed = CHECKSUM_PARTIAL;
diff --git a/net/sctp/sm_make_chunk.c b/net/sctp/sm_make_chunk.c
index d244a23ab8d3..fe690320b1e4 100644
--- a/net/sctp/sm_make_chunk.c
+++ b/net/sctp/sm_make_chunk.c
@@ -1297,6 +1297,13 @@ struct sctp_chunk *sctp_make_auth(const struct sctp_association *asoc)
 
 /* Turn an skb into a chunk.
  * FIXME: Eventually move the structure directly inside the skb->cb[].
+ *
+ * sctpimpguide-05.txt Section 2.8.2
+ * M1) Each time a new DATA chunk is transmitted
+ * set the 'TSN.Missing.Report' count for that TSN to 0. The
+ * 'TSN.Missing.Report' count will be used to determine missing chunks
+ * and when to fast retransmit.
+ *
  */
 struct sctp_chunk *sctp_chunkify(struct sk_buff *skb,
                             const struct sctp_association *asoc,
@@ -1314,29 +1321,9 @@ struct sctp_chunk *sctp_chunkify(struct sk_buff *skb,
         INIT_LIST_HEAD(&retval->list);
         retval->skb             = skb;
         retval->asoc            = (struct sctp_association *)asoc;
-        retval->has_tsn         = 0;
-        retval->has_ssn         = 0;
-        retval->rtt_in_progress = 0;
-        retval->sent_at         = 0;
         retval->singleton       = 1;
-        retval->end_of_packet   = 0;
-        retval->ecn_ce_done     = 0;
-        retval->pdiscard        = 0;
-
-        /* sctpimpguide-05.txt Section 2.8.2
-         * M1) Each time a new DATA chunk is transmitted
-         * set the 'TSN.Missing.Report' count for that TSN to 0. The
-         * 'TSN.Missing.Report' count will be used to determine missing chunks
-         * and when to fast retransmit.
-         */
-        retval->tsn_missing_report = 0;
-        retval->tsn_gap_acked = 0;
-        retval->fast_retransmit = SCTP_CAN_FRTX;
 
-        /* If this is a fragmented message, track all fragments
-         * of the message (for SEND_FAILED).
-         */
-        retval->msg = NULL;
+        retval->fast_retransmit = SCTP_CAN_FRTX;
 
         /* Polish the bead hole.  */
         INIT_LIST_HEAD(&retval->transmitted_list);
diff --git a/net/sctp/sm_sideeffect.c b/net/sctp/sm_sideeffect.c
index 666c66842799..1a6eef39ab2f 100644
--- a/net/sctp/sm_sideeffect.c
+++ b/net/sctp/sm_sideeffect.c
@@ -860,7 +860,6 @@ static void sctp_cmd_delete_tcb(sctp_cmd_seq_t *cmds,
             (!asoc->temp) && (sk->sk_shutdown != SHUTDOWN_MASK))
                 return;
 
-        BUG_ON(asoc->peer.primary_path == NULL);
         sctp_unhash_established(asoc);
         sctp_association_free(asoc);
 }
diff --git a/net/sctp/socket.c b/net/sctp/socket.c
index 911b71b26b0e..72046b9729a8 100644
--- a/net/sctp/socket.c
+++ b/net/sctp/socket.c
@@ -5890,7 +5890,7 @@ static long sctp_get_port_local(struct sock *sk, union sctp_addr *addr)
                 int low, high, remaining, index;
                 unsigned int rover;
 
-                inet_get_local_port_range(&low, &high);
+                inet_get_local_port_range(sock_net(sk), &low, &high);
                 remaining = (high - low) + 1;
                 rover = net_random() % remaining + low;