From: Arnaldo Carvalho de Melo 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-Tag: v2.6.14-rc1~1035^2~39 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=a4beb1b64f5846e216bf2c439022df480151902a;p=linux-2.6-omap-h63xx.git [DCCP]: Send a DATAACK packet when we have a TIMESTAMP_ECHO pending Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller --- diff --git a/net/dccp/output.c b/net/dccp/output.c index 630ca774102..f96dedd3ad5 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))