tcp: remove SKBTX_ACK_TSTAMP since it is redundant

[deliverable/linux.git] / net / ipv4 / tcp_input.c

diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index 0d5239c283cb5eae97ef645ecd1640e1bad41839..70c370b937621b4e5144fe3fd47bb1bddc9fa6bd 100644 (file)
--- 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);
 }