---

yaml --- r: 6406 b: refs/heads/master c: a4beb1b h: refs/heads/master v: v3
git-mirror · Aug 29, 2005 · e3f96ed · e3f96ed
1 parent ef797c7
commit e3f96ed
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 20472af986569b0615bd77f0fd7ca9e3d33e9895
+refs/heads/master: a4beb1b64f5846e216bf2c439022df480151902a
diff --git a/trunk/net/dccp/output.c b/trunk/net/dccp/output.c
@@ -171,6 +171,7 @@ int dccp_write_xmit(struct sock *sk, struct sk_buff *skb, const int len)
 			 * dccps_ack_pending or use icsk.
 			 */
 		} else if (inet_csk_ack_scheduled(sk) ||
+			   dp->dccps_timestamp_echo != 0 ||
 			   (dp->dccps_options.dccpo_send_ack_vector &&
 			    ap->dccpap_buf_ackno != DCCP_MAX_SEQNO + 1 &&
 			    ap->dccpap_ack_seqno == DCCP_MAX_SEQNO + 1))