From: Willem de Bruijn <willemb@google.com>
Date: Tue, 12 Aug 2014 18:53:16 +0000 (-0400)
Subject: net-timestamp: fix missing ACK timestamp
X-Git-Tag: omap-for-v3.17/fixes-against-rc2~59^2~18
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=712a72213fad36cc9e6ec706b5e020d7eb6e03bc;p=pandora-kernel.git

net-timestamp: fix missing ACK timestamp

ACK timestamps are generated in tcp_clean_rtx_queue. The TSO datapath
can break out early, causing the timestamp code to be skipped. Move
the code up before the break.

Reported-by: David S. Miller <davem@davemloft.net>

Also fix a boundary condition: tp->snd_una is the next unacknowledged
byte and between tests inclusive (a <= b <= c), so generate a an ACK
timestamp if (prior_snd_una <= tskey <= tp->snd_una - 1).

Signed-off-by: Willem de Bruijn <willemb@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

Reading git-diff-tree failed