aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/tcp_input.c
diff options
context:
space:
mode:
authorEric Dumazet <edumazet@google.com>2014-09-05 18:33:33 -0400
committerDavid S. Miller <davem@davemloft.net>2014-09-05 20:49:33 -0400
commit7faee5c0d514162853a343d93e4a0b6bb8bfec21 (patch)
treeebaba03f755dfbe9d942fbe610ce3aecd1b0fc33 /net/ipv4/tcp_input.c
parent04317dafd11dd7b0ec19b85f098414abae6ed5f7 (diff)
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_input.c')
-rw-r--r--net/ipv4/tcp_input.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index 9c8b9f1dcf69..f97003ad0af5 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -2967,7 +2967,8 @@ void tcp_rearm_rto(struct sock *sk)
2967 if (icsk->icsk_pending == ICSK_TIME_EARLY_RETRANS || 2967 if (icsk->icsk_pending == ICSK_TIME_EARLY_RETRANS ||
2968 icsk->icsk_pending == ICSK_TIME_LOSS_PROBE) { 2968 icsk->icsk_pending == ICSK_TIME_LOSS_PROBE) {
2969 struct sk_buff *skb = tcp_write_queue_head(sk); 2969 struct sk_buff *skb = tcp_write_queue_head(sk);
2970 const u32 rto_time_stamp = TCP_SKB_CB(skb)->when + rto; 2970 const u32 rto_time_stamp =
2971 tcp_skb_timestamp(skb) + rto;
2971 s32 delta = (s32)(rto_time_stamp - tcp_time_stamp); 2972 s32 delta = (s32)(rto_time_stamp - tcp_time_stamp);
2972 /* delta may not be positive if the socket is locked 2973 /* delta may not be positive if the socket is locked
2973 * when the retrans timer fires and is rescheduled. 2974 * when the retrans timer fires and is rescheduled.