---

yaml
---
r: 37215
b: refs/heads/master
c: f236218
h: refs/heads/master
i:
  37213: 36728c9
  37211: 765545d
  37207: 9c075e2
  37199: d239d4e
  37183: beeb425
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b56bab46f3220eb6b1f71c000faa44c6b13fb148
+refs/heads/master: f236218b7292bccb0f8754a0feb5d9e9a06fe5a2

trunk/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);

trunk/net/sctp/sm_make_chunk.c

@@ -1447,8 +1447,16 @@ struct sctp_association *sctp_unpack_cookie(
 	/* 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;
 		/*