From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: David Howells <dhowells@redhat.com>,
Sasha Levin <sashal@kernel.org>,
marc.dionne@auristor.com, davem@davemloft.net,
edumazet@google.com, kuba@kernel.org, pabeni@redhat.com,
linux-afs@lists.infradead.org, netdev@vger.kernel.org
Subject: [PATCH AUTOSEL 5.15 06/16] rxrpc: Fix calc of resend age
Date: Wed, 14 Sep 2022 05:02:14 -0400 [thread overview]
Message-ID: <20220914090224.470913-6-sashal@kernel.org> (raw)
In-Reply-To: <20220914090224.470913-1-sashal@kernel.org>
From: David Howells <dhowells@redhat.com>
[ Upstream commit 214a9dc7d852216e83acac7b75bc18f01ce184c2 ]
Fix the calculation of the resend age to add a microsecond value as
microseconds, not nanoseconds.
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
net/rxrpc/call_event.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/rxrpc/call_event.c b/net/rxrpc/call_event.c
index f8ecad2b730e8..2a93e7b5fbd05 100644
--- a/net/rxrpc/call_event.c
+++ b/net/rxrpc/call_event.c
@@ -166,7 +166,7 @@ static void rxrpc_resend(struct rxrpc_call *call, unsigned long now_j)
_enter("{%d,%d}", call->tx_hard_ack, call->tx_top);
now = ktime_get_real();
- max_age = ktime_sub(now, jiffies_to_usecs(call->peer->rto_j));
+ max_age = ktime_sub_us(now, jiffies_to_usecs(call->peer->rto_j));
spin_lock_bh(&call->lock);
--
2.35.1
next prev parent reply other threads:[~2022-09-14 9:05 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-14 9:02 [PATCH AUTOSEL 5.15 01/16] arm64: dts: juno: Add missing MHU secure-irq Sasha Levin
2022-09-14 9:02 ` [PATCH AUTOSEL 5.15 02/16] ASoC: nau8824: Fix semaphore unbalance at error paths Sasha Levin
2022-09-14 9:02 ` [PATCH AUTOSEL 5.15 03/16] regulator: pfuze100: Fix the global-out-of-bounds access in pfuze100_regulator_probe() Sasha Levin
2022-09-14 9:02 ` [PATCH AUTOSEL 5.15 04/16] scsi: lpfc: Return DID_TRANSPORT_DISRUPTED instead of DID_REQUEUE Sasha Levin
2022-09-14 9:02 ` [PATCH AUTOSEL 5.15 05/16] rxrpc: Fix local destruction being repeated Sasha Levin
2022-09-14 9:02 ` Sasha Levin [this message]
2022-09-14 9:02 ` [PATCH AUTOSEL 5.15 07/16] wifi: mac80211_hwsim: check length for virtio packets Sasha Levin
2022-09-14 9:02 ` [PATCH AUTOSEL 5.15 08/16] ALSA: hda/sigmatel: Keep power up while beep is enabled Sasha Levin
2022-09-14 9:02 ` [PATCH AUTOSEL 5.15 09/16] ALSA: hda/tegra: Align BDL entry to 4KB boundary Sasha Levin
2022-09-14 9:02 ` [PATCH AUTOSEL 5.15 10/16] ALSA: usb-audio: Fix an out-of-bounds bug in __snd_usb_parse_audio_interface() Sasha Levin
2022-09-14 9:02 ` [PATCH AUTOSEL 5.15 11/16] net: usb: qmi_wwan: add Quectel RM520N Sasha Levin
2022-09-14 9:02 ` [PATCH AUTOSEL 5.15 12/16] afs: Return -EAGAIN, not -EREMOTEIO, when a file already locked Sasha Levin
2022-09-14 9:02 ` [PATCH AUTOSEL 5.15 13/16] scsi: mpt3sas: Fix use-after-free warning Sasha Levin
2022-09-14 9:02 ` [PATCH AUTOSEL 5.15 14/16] MIPS: OCTEON: irq: Fix octeon_irq_force_ciu_mapping() Sasha Levin
2022-09-14 9:02 ` [PATCH AUTOSEL 5.15 15/16] drm/panfrost: devfreq: set opp to the recommended one to configure regulator Sasha Levin
2022-09-14 9:02 ` [PATCH AUTOSEL 5.15 16/16] mksysmap: Fix the mismatch of 'L0' symbols in System.map Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220914090224.470913-6-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=davem@davemloft.net \
--cc=dhowells@redhat.com \
--cc=edumazet@google.com \
--cc=kuba@kernel.org \
--cc=linux-afs@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=marc.dionne@auristor.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®