diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2018-05-15 16:30:17 +0300 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2018-05-15 16:30:17 +0300 |
| commit | 291c161f6c65530092903fbea58eb07a62b220ba (patch) | |
| tree | 5b2186b7e7faf257e7184348f0217060de09ce88 /net/rxrpc/input.c | |
| parent | eaeb1f4d892936133c5f8d3aafb36b7f384fe59c (diff) | |
| parent | f3903c9161f0d636a7b0ff03841628928457e64c (diff) | |
| download | linux-291c161f6c65530092903fbea58eb07a62b220ba.tar.xz | |
Merge remote-tracking branch 'tip/perf/urgent' into perf/core
To pick up fixes, notably the revert for the intel_pt//u regression.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'net/rxrpc/input.c')
| -rw-r--r-- | net/rxrpc/input.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/rxrpc/input.c b/net/rxrpc/input.c index 0410d2277ca2..b5fd6381313d 100644 --- a/net/rxrpc/input.c +++ b/net/rxrpc/input.c @@ -971,7 +971,7 @@ static void rxrpc_input_call_packet(struct rxrpc_call *call, if (timo) { unsigned long now = jiffies, expect_rx_by; - expect_rx_by = jiffies + timo; + expect_rx_by = now + timo; WRITE_ONCE(call->expect_rx_by, expect_rx_by); rxrpc_reduce_call_timer(call, expect_rx_by, now, rxrpc_timer_set_for_normal); |