summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@mandriva.com>2005-08-24 06:50:45 +0200
committerDavid S. Miller <davem@sunset.davemloft.net>2005-08-30 01:04:43 +0200
commita4beb1b64f5846e216bf2c439022df480151902a (patch)
treeb9415975544fa2bcd78f3f9b51a8eeb11a60c6bc /net
parent[DCCP]: Fix skb leak in dccp_sendmsg (diff)
downloadlinux-a4beb1b64f5846e216bf2c439022df480151902a.tar.xz
linux-a4beb1b64f5846e216bf2c439022df480151902a.zip
[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>
Diffstat (limited to 'net')
-rw-r--r--net/dccp/output.c1
1 files changed, 1 insertions, 0 deletions
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))