diff options
| author | Wolfram Sang <wsa@the-dreams.de> | 2017-08-27 16:14:49 +0300 |
|---|---|---|
| committer | Wolfram Sang <wsa@the-dreams.de> | 2017-08-27 16:14:49 +0300 |
| commit | 8ce0436789b006622fcb6baea0c29b99385612dd (patch) | |
| tree | 9da56689f451c3644aa044d13e58caf978cd6f2e /net/ipv4/tcp_output.c | |
| parent | ed1094012ae82798de33bad0ba1cc5f19a005e68 (diff) | |
| parent | fabf08a0cd63ce39287646ceea10ac34781418f4 (diff) | |
| download | linux-8ce0436789b006622fcb6baea0c29b99385612dd.tar.xz | |
Merge branch 'i2c-mux/for-next' of https://github.com/peda-r/i2c-mux into i2c/for-4.14
Diffstat (limited to 'net/ipv4/tcp_output.c')
| -rw-r--r-- | net/ipv4/tcp_output.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index 4e985dea1dd2..2f1588bf73da 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c @@ -2202,9 +2202,10 @@ static bool tcp_small_queue_check(struct sock *sk, const struct sk_buff *skb, static void tcp_chrono_set(struct tcp_sock *tp, const enum tcp_chrono new) { const u32 now = tcp_jiffies32; + enum tcp_chrono old = tp->chrono_type; - if (tp->chrono_type > TCP_CHRONO_UNSPEC) - tp->chrono_stat[tp->chrono_type - 1] += now - tp->chrono_start; + if (old > TCP_CHRONO_UNSPEC) + tp->chrono_stat[old - 1] += now - tp->chrono_start; tp->chrono_start = now; tp->chrono_type = new; } |