5 files changed, 22 insertions, 13 deletions

diff --git a/net/sctp/input.c b/net/sctp/input.c
index 03f65de75d88..64f630102532 100644
--- a/net/sctp/input.c
+++ b/net/sctp/input.c
@@ -218,12 +218,6 @@ int sctp_rcv(struct sk_buff *skb)
                 }
         }
 
-        /* SCTP seems to always need a timestamp right now (FIXME) */
-        if (skb->tstamp.off_sec == 0) {
-                __net_timestamp(skb);
-                sock_enable_timestamp(sk); 
-        }
-
         if (!xfrm_policy_check(sk, XFRM_POLICY_IN, skb, family))
                 goto discard_release;
         nf_reset(skb);
@@ -388,7 +382,7 @@ void sctp_icmp_frag_needed(struct sock *sk, struct sctp_association *asoc,
                          * pmtu discovery on this transport.
                          */
                         t->pathmtu = SCTP_DEFAULT_MINSEGMENT;
-                        t->param_flags = (t->param_flags & ~SPP_HB) |
+                        t->param_flags = (t->param_flags & ~SPP_PMTUD) |
                                 SPP_PMTUD_DISABLE;
                 } else {
                         t->pathmtu = pmtu;
diff --git a/net/sctp/output.c b/net/sctp/output.c
index cdc5a3936766..3ef4351dd956 100644
--- a/net/sctp/output.c
+++ b/net/sctp/output.c
@@ -633,7 +633,7 @@ static sctp_xmit_t sctp_packet_append_data(struct sctp_packet *packet,
                  * data will fit or delay in hopes of bundling a full
                  * sized packet.
                  */
-                if (len < asoc->pathmtu - packet->overhead) {
+                if (len < asoc->frag_point) {
                         retval = SCTP_XMIT_NAGLE_DELAY;
                         goto finish;
                 }
@@ -645,7 +645,13 @@ static sctp_xmit_t sctp_packet_append_data(struct sctp_packet *packet,
         /* Keep track of how many bytes are in flight to the receiver. */
         asoc->outqueue.outstanding_bytes += datasize;
 
-        /* Update our view of the receiver's rwnd. */
+        /* Update our view of the receiver's rwnd. Include sk_buff overhead
+         * while updating peer.rwnd so that it reduces the chances of a
+         * receiver running out of receive buffer space even when receive
+         * window is still open. This can happen when a sender is sending
+         * sending small messages.
+         */
+        datasize += sizeof(struct sk_buff);
         if (datasize < rwnd)
                 rwnd -= datasize;
         else
diff --git a/net/sctp/outqueue.c b/net/sctp/outqueue.c
index 37074a39ecbb..739582415bf6 100644
--- a/net/sctp/outqueue.c
+++ b/net/sctp/outqueue.c
@@ -416,7 +416,8 @@ void sctp_retransmit_mark(struct sctp_outq *q,
                          * (Section 7.2.4)), add the data size of those
                          * chunks to the rwnd.
                          */
-                        q->asoc->peer.rwnd += sctp_data_size(chunk);
+                        q->asoc->peer.rwnd += (sctp_data_size(chunk) +
+                                                sizeof(struct sk_buff));
                         q->outstanding_bytes -= sctp_data_size(chunk);
                         transport->flight_size -= sctp_data_size(chunk);
 
diff --git a/net/sctp/sm_make_chunk.c b/net/sctp/sm_make_chunk.c
index 7745bdea7817..507dff72c585 100644
--- a/net/sctp/sm_make_chunk.c
+++ b/net/sctp/sm_make_chunk.c
@@ -1447,8 +1447,16 @@ no_hmac:
         /* Check to see if the cookie is stale.  If there is already
          * an association, there is no need to check cookie's expiration
          * for init collision case of lost COOKIE ACK.
+         * If skb has been timestamped, then use the stamp, otherwise
+         * use current time.  This introduces a small possibility that
+         * that a cookie may be considered expired, but his would only slow
+         * down the new association establishment instead of every packet.
          */
-        skb_get_timestamp(skb, &tv);
+        if (sock_flag(ep->base.sk, SOCK_TIMESTAMP))
+                skb_get_timestamp(skb, &tv);
+        else
+                do_gettimeofday(&tv);
+
         if (!asoc && tv_lt(bear_cookie->expiration, tv)) {
                 __u16 len;
                 /*
diff --git a/net/sctp/socket.c b/net/sctp/socket.c
index 79c3e072cf28..3fe906d65069 100644
--- a/net/sctp/socket.c
+++ b/net/sctp/socket.c
@@ -3084,8 +3084,8 @@ SCTP_STATIC int sctp_init_sock(struct sock *sk)
          */
         sp->disable_fragments = 0;
 
-        /* Turn on/off any Nagle-like algorithm.  */
-        sp->nodelay           = 1;
+        /* Enable Nagle algorithm by default.  */
+        sp->nodelay           = 0;
 
         /* Enable by default. */
         sp->v4mapped          = 1;