Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[safe/jmp/linux-2.6] / net / sctp / associola.c

diff --git a/net/sctp/associola.c b/net/sctp/associola.c
index 1f05b94..99c93ee 100644 (file)
--- a/net/sctp/associola.c
+++ b/net/sctp/associola.c
@@ -63,6 +63,12 @@
 static void sctp_assoc_bh_rcv(struct work_struct *work);
 static void sctp_assoc_free_asconf_acks(struct sctp_association *asoc);
 
+/* Keep track of the new idr low so that we don't re-use association id
+ * numbers too fast.  It is protected by they idr spin lock is in the
+ * range of 1 - INT_MAX.
+ */
+static u32 idr_low = 1;
+
 
 /* 1st Level Abstractions. */
 
@@ -167,7 +173,7 @@ static struct sctp_association *sctp_association_init(struct sctp_association *a
        asoc->timeouts[SCTP_EVENT_TIMEOUT_HEARTBEAT] = 0;
        asoc->timeouts[SCTP_EVENT_TIMEOUT_SACK] = asoc->sackdelay;
        asoc->timeouts[SCTP_EVENT_TIMEOUT_AUTOCLOSE] =
-               sp->autoclose * HZ;
+               (unsigned long)sp->autoclose * HZ;
 
        /* Initilizes the timers */
        for (i = SCTP_EVENT_TIMEOUT_NONE; i < SCTP_NUM_TIMEOUT_TYPES; ++i)
@@ -512,7 +518,13 @@ void sctp_assoc_set_primary(struct sctp_association *asoc,
         * to this destination address earlier. The sender MUST set
         * CYCLING_CHANGEOVER to indicate that this switch is a
         * double switch to the same destination address.
+        *
+        * Really, only bother is we have data queued or outstanding on
+        * the association.
         */
+       if (!asoc->outqueue.outstanding_bytes && !asoc->outqueue.out_qlen)
+               return;
+
        if (transport->cacc.changeover_active)
                transport->cacc.cycling_changeover = changeover;
 
@@ -584,6 +596,33 @@ void sctp_assoc_rm_peer(struct sctp_association *asoc,
            asoc->addip_last_asconf->transport == peer)
                asoc->addip_last_asconf->transport = NULL;
 
+       /* If we have something on the transmitted list, we have to
+        * save it off.  The best place is the active path.
+        */
+       if (!list_empty(&peer->transmitted)) {
+               struct sctp_transport *active = asoc->peer.active_path;
+               struct sctp_chunk *ch;
+
+               /* Reset the transport of each chunk on this list */
+               list_for_each_entry(ch, &peer->transmitted,
+                                       transmitted_list) {
+                       ch->transport = NULL;
+                       ch->rtt_in_progress = 0;
+               }
+
+               list_splice_tail_init(&peer->transmitted,
+                                       &active->transmitted);
+
+               /* Start a T3 timer here in case it wasn't running so
+                * that these migrated packets have a chance to get
+                * retrnasmitted.
+                */
+               if (!timer_pending(&active->T3_rtx_timer))
+                       if (!mod_timer(&active->T3_rtx_timer,
+                                       jiffies + active->rto))
+                               sctp_transport_hold(active);
+       }
+
        asoc->peer.transport_count--;
 
        sctp_transport_free(peer);
@@ -653,13 +692,15 @@ struct sctp_transport *sctp_assoc_add_peer(struct sctp_association *asoc,
         */
        peer->param_flags = asoc->param_flags;
 
+       sctp_transport_route(peer, NULL, sp);
+
        /* Initialize the pmtu of the transport. */
-       if (peer->param_flags & SPP_PMTUD_ENABLE)
-               sctp_transport_pmtu(peer);
-       else if (asoc->pathmtu)
-               peer->pathmtu = asoc->pathmtu;
-       else
-               peer->pathmtu = SCTP_DEFAULT_MAXSEGMENT;
+       if (peer->param_flags & SPP_PMTUD_DISABLE) {
+               if (asoc->pathmtu)
+                       peer->pathmtu = asoc->pathmtu;
+               else
+                       peer->pathmtu = SCTP_DEFAULT_MAXSEGMENT;
+       }
 
        /* If this is the first transport addr on this association,
         * initialize the association PMTU to the peer's PMTU.
@@ -703,6 +744,7 @@ struct sctp_transport *sctp_assoc_add_peer(struct sctp_association *asoc,
 
        peer->partial_bytes_acked = 0;
        peer->flight_size = 0;
+       peer->burst_limited = 0;
 
        /* Set the transport's RTO.initial value */
        peer->rto = asoc->rto_initial;
@@ -1152,8 +1194,10 @@ void sctp_assoc_update(struct sctp_association *asoc,
        /* Remove any peer addresses not present in the new association. */
        list_for_each_safe(pos, temp, &asoc->peer.transport_addr_list) {
                trans = list_entry(pos, struct sctp_transport, transports);
-               if (!sctp_assoc_lookup_paddr(new, &trans->ipaddr))
-                       sctp_assoc_del_peer(asoc, &trans->ipaddr);
+               if (!sctp_assoc_lookup_paddr(new, &trans->ipaddr)) {
+                       sctp_assoc_rm_peer(asoc, trans);
+                       continue;
+               }
 
                if (asoc->state >= SCTP_STATE_ESTABLISHED)
                        sctp_transport_reset(trans);
@@ -1348,8 +1392,9 @@ static inline int sctp_peer_needs_update(struct sctp_association *asoc)
        case SCTP_STATE_SHUTDOWN_RECEIVED:
        case SCTP_STATE_SHUTDOWN_SENT:
                if ((asoc->rwnd > asoc->a_rwnd) &&
-                   ((asoc->rwnd - asoc->a_rwnd) >=
-                    min_t(__u32, (asoc->base.sk->sk_rcvbuf >> 1), asoc->pathmtu)))
+                   ((asoc->rwnd - asoc->a_rwnd) >= max_t(__u32,
+                          (asoc->base.sk->sk_rcvbuf >> sctp_rwnd_upd_shift),
+                          asoc->pathmtu)))
                        return 1;
                break;
        default:
@@ -1456,15 +1501,13 @@ void sctp_assoc_rwnd_decrease(struct sctp_association *asoc, unsigned len)
  * local endpoint and the remote peer.
  */
 int sctp_assoc_set_bind_addr_from_ep(struct sctp_association *asoc,
-                                    gfp_t gfp)
+                                    sctp_scope_t scope, gfp_t gfp)
 {
-       sctp_scope_t scope;
        int flags;
 
        /* Use scoping rules to determine the subset of addresses from
         * the endpoint.
         */
-       scope = sctp_scope(&asoc->peer.active_path->ipaddr);
        flags = (PF_INET6 == asoc->base.sk->sk_family) ? SCTP_ADDR6_ALLOWED : 0;
        if (asoc->peer.ipv4_address)
                flags |= SCTP_ADDR4_PEERSUPP;
@@ -1518,7 +1561,12 @@ retry:
 
        spin_lock_bh(&sctp_assocs_id_lock);
        error = idr_get_new_above(&sctp_assocs_id, (void *)asoc,
-                                   1, &assoc_id);
+                                   idr_low, &assoc_id);
+       if (!error) {
+               idr_low = assoc_id + 1;
+               if (idr_low == INT_MAX)
+                       idr_low = 1;
+       }
        spin_unlock_bh(&sctp_assocs_id_lock);
        if (error == -EAGAIN)
                goto retry;