diff options
| author | David S. Miller <davem@davemloft.net> | 2018-08-09 21:52:36 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-08-09 21:52:36 +0300 |
| commit | a736e074680745faa5dc6be8dd3c58ad4850aab9 (patch) | |
| tree | 620e6d20cfce3806399fbefa8d911cc848463f9b /net/rxrpc/rxkad.c | |
| parent | 192e91d244e376b32d90ffbf78c87a0fb35a4040 (diff) | |
| parent | 112cbae26d18e75098d95cc234cfa5059de8d479 (diff) | |
| download | linux-a736e074680745faa5dc6be8dd3c58ad4850aab9.tar.xz | |
Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net
Overlapping changes in RXRPC, changing to ktime_get_seconds() whilst
adding some tracepoints.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/rxrpc/rxkad.c')
| -rw-r--r-- | net/rxrpc/rxkad.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/rxrpc/rxkad.c b/net/rxrpc/rxkad.c index eaf8f4f446b0..cea16838d588 100644 --- a/net/rxrpc/rxkad.c +++ b/net/rxrpc/rxkad.c @@ -670,7 +670,7 @@ static int rxkad_issue_challenge(struct rxrpc_connection *conn) return -EAGAIN; } - conn->params.peer->last_tx_at = ktime_get_real(); + conn->params.peer->last_tx_at = ktime_get_seconds(); trace_rxrpc_tx_packet(conn->debug_id, &whdr, rxrpc_tx_point_rxkad_challenge); _leave(" = 0"); @@ -728,8 +728,7 @@ static int rxkad_send_response(struct rxrpc_connection *conn, return -EAGAIN; } - conn->params.peer->last_tx_at = ktime_get_real(); - trace_rxrpc_tx_packet(0, &whdr, rxrpc_tx_point_rxkad_response); + conn->params.peer->last_tx_at = ktime_get_seconds(); _leave(" = 0"); return 0; } |