diff options
author | Eric Dumazet <edumazet@google.com> | 2017-05-16 17:00:03 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-05-17 16:06:01 -0400 |
commit | d635fbe27ebee0f4b845abe5e9620c9400785a5c (patch) | |
tree | 76982f9042c717aef9be65f1ede08c128a8dea09 /net/ipv4/tcp_timer.c | |
parent | d011b9a448907833a19b2f0a34381419f8ca9b23 (diff) |
tcp: use tcp_jiffies32 to feed tp->lsndtime
Use tcp_jiffies32 instead of tcp_time_stamp to feed
tp->lsndtime.
tcp_time_stamp will soon be a litle bit more expensive
than simply reading 'jiffies'.
Signed-off-by: Eric Dumazet <edumazet@google.com>
Acked-by: Soheil Hassas Yeganeh <soheil@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp_timer.c')
-rw-r--r-- | net/ipv4/tcp_timer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c index ec7c5473c788..5f6f219a431e 100644 --- a/net/ipv4/tcp_timer.c +++ b/net/ipv4/tcp_timer.c | |||
@@ -63,7 +63,7 @@ static int tcp_out_of_resources(struct sock *sk, bool do_reset) | |||
63 | 63 | ||
64 | /* If peer does not open window for long time, or did not transmit | 64 | /* If peer does not open window for long time, or did not transmit |
65 | * anything for long time, penalize it. */ | 65 | * anything for long time, penalize it. */ |
66 | if ((s32)(tcp_time_stamp - tp->lsndtime) > 2*TCP_RTO_MAX || !do_reset) | 66 | if ((s32)(tcp_jiffies32 - tp->lsndtime) > 2*TCP_RTO_MAX || !do_reset) |
67 | shift++; | 67 | shift++; |
68 | 68 | ||
69 | /* If some dubious ICMP arrived, penalize even more. */ | 69 | /* If some dubious ICMP arrived, penalize even more. */ |
@@ -73,7 +73,7 @@ static int tcp_out_of_resources(struct sock *sk, bool do_reset) | |||
73 | if (tcp_check_oom(sk, shift)) { | 73 | if (tcp_check_oom(sk, shift)) { |
74 | /* Catch exceptional cases, when connection requires reset. | 74 | /* Catch exceptional cases, when connection requires reset. |
75 | * 1. Last segment was sent recently. */ | 75 | * 1. Last segment was sent recently. */ |
76 | if ((s32)(tcp_time_stamp - tp->lsndtime) <= TCP_TIMEWAIT_LEN || | 76 | if ((s32)(tcp_jiffies32 - tp->lsndtime) <= TCP_TIMEWAIT_LEN || |
77 | /* 2. Window is closed. */ | 77 | /* 2. Window is closed. */ |
78 | (!tp->snd_wnd && !tp->packets_out)) | 78 | (!tp->snd_wnd && !tp->packets_out)) |
79 | do_reset = true; | 79 | do_reset = true; |