diff options
| author | David S. Miller <davem@davemloft.net> | 2016-04-28 16:06:11 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-04-28 16:06:11 -0400 |
| commit | 2a9e8438a29c00432ae14eaceb088b965f8ac290 (patch) | |
| tree | 8ac718cd55a6ec72241c647e38856d904797a078 /net/ipv4/tcp_input.c | |
| parent | ba7863f4d3bfe1698e0a92934cbc9c3021f4448d (diff) | |
| parent | 0a2cf20c3fb62ad4717276b5303bf831f7b29d54 (diff) | |
| download | linux-2a9e8438a29c00432ae14eaceb088b965f8ac290.tar.gz linux-2a9e8438a29c00432ae14eaceb088b965f8ac290.tar.xz | |
Merge branch 'tcp-redundant-checks'
Soheil Hassas Yeganeh says:
====================
tcp: simplify ack tx timestamps
v2:
- Fully remove SKBTX_ACK_TSTAMP, as suggested by Willem de Bruijn.
This patch series aims at removing redundant checks and fields
for ack timestamps for TCP.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp_input.c')
| -rw-r--r-- | net/ipv4/tcp_input.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index 0d5239c283cb..70c370b93762 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -3087,8 +3087,7 @@ static void tcp_ack_tstamp(struct sock *sk, struct sk_buff *skb, return; shinfo = skb_shinfo(skb); - if ((shinfo->tx_flags & SKBTX_ACK_TSTAMP) && - !before(shinfo->tskey, prior_snd_una) && + if (!before(shinfo->tskey, prior_snd_una) && before(shinfo->tskey, tcp_sk(sk)->snd_una)) __skb_tstamp_tx(skb, NULL, sk, SCM_TSTAMP_ACK); } |