diff options
| author |   Eric Dumazet <edumazet@google.com> | 2014-09-05 15:33:33 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2014-09-05 17:49:33 -0700 |
| commit | 7faee5c0d514162853a343d93e4a0b6bb8bfec21 (patch) | |
| tree | ebaba03f755dfbe9d942fbe610ce3aecd1b0fc33 /net/ipv4/tcp_ipv4.c | |
| parent | tcp: introduce TCP_SKB_CB(skb)->tcp_tw_isn (diff) | |
| download | linux-dev-7faee5c0d514162853a343d93e4a0b6bb8bfec21.tar.xz linux-dev-7faee5c0d514162853a343d93e4a0b6bb8bfec21.zip | |
tcp: remove TCP_SKB_CB(skb)->when
After commit 740b0f1841f6 ("tcp: switch rtt estimations to usec resolution"),
we no longer need to maintain timestamps in two different fields.
TCP_SKB_CB(skb)->when can be removed, as same information sits in skb_mstamp.stamp_jiffies
Signed-off-by: Eric Dumazet <edumazet@google.com>
Acked-by: Yuchung Cheng <ycheng@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp_ipv4.c')
| -rw-r--r-- | net/ipv4/tcp_ipv4.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index 02e6cd29ebf1..3f9bc3f0bba0 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c @@ -437,8 +437,9 @@ void tcp_v4_err(struct sk_buff *icmp_skb, u32 info) skb = tcp_write_queue_head(sk); BUG_ON(!skb); - remaining = icsk->icsk_rto - min(icsk->icsk_rto, - tcp_time_stamp - TCP_SKB_CB(skb)->when); + remaining = icsk->icsk_rto - + min(icsk->icsk_rto, + tcp_time_stamp - tcp_skb_timestamp(skb)); if (remaining) { inet_csk_reset_xmit_timer(sk, ICSK_TIME_RETRANS, |