From: Arnaldo Carvalho de Melo <acme@mandriva.com>
Date: Wed, 24 Aug 2005 04:50:45 +0000 (-0700)
Subject: [DCCP]: Send a DATAACK packet when we have a TIMESTAMP_ECHO pending
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=a4beb1b64f5846e216bf2c439022df480151902a;p=deliverable%2Flinux.git

[DCCP]: Send a DATAACK packet when we have a TIMESTAMP_ECHO pending

Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/dccp/output.c b/net/dccp/output.c
index 630ca7741022..f96dedd3ad5e 100644
--- a/net/dccp/output.c
+++ b/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))