From: David S. Miller Date: Sun, 28 Jun 2020 00:41:27 +0000 (-0700) Subject: Merge branch 'tcp-improve-delivered-counts-in-SCM_TSTAMP_ACK' X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=491f14db45dc7fc08ffe00ea6881615638dd159c;p=linux.git Merge branch 'tcp-improve-delivered-counts-in-SCM_TSTAMP_ACK' Yousuk Seung says: ==================== tcp: improve delivered counts in SCM_TSTAMP_ACK Currently delivered and delivered_ce in OPT_STATS of SCM_TSTAMP_ACK do not fully reflect the current ack being timestamped. Also they are not in sync as the delivered count includes packets being sacked and some of cumulatively acked but delivered_ce includes none. This patch series updates tp->delivered and tp->delivered_ce together to keep them in sync. It also moves generating SCM_TSTAMP_ACK to later in tcp_clean_rtx_queue() to reflect packets being cumulatively acked up until the current skb for sack-enabled connections. ==================== Signed-off-by: David S. Miller --- 491f14db45dc7fc08ffe00ea6881615638dd159c