From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E3EDDECAAD8 for ; Wed, 14 Sep 2022 09:07:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231292AbiINJHg (ORCPT ); Wed, 14 Sep 2022 05:07:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50026 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230457AbiINJG0 (ORCPT ); Wed, 14 Sep 2022 05:06:26 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3715A76749; Wed, 14 Sep 2022 02:03:33 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id A8AC2B8170C; Wed, 14 Sep 2022 09:03:32 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B6F8BC43141; Wed, 14 Sep 2022 09:03:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1663146211; bh=wWLBRCoyI+A/DImeDDnxC1KCwDlW7lSe99pqruGvWlY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rd7sZkg0kRIiCakCsXdqYLY+IkyLX3iaAKP8hh3ScqoXc91pLHpwpZP+92DzH7HDL JL5LhScAtsmFa7OUFVS1K+XHkS1TOMz9Pxu5tPeqwHcbd6TYorB/arq93juSpnTRLy j6C462GuNIfGmbWvvEk+J4eEEl6c+qOkP9B0oIXPyXPRre/nrtgnsdHKtIlYCz7qOr MbKTt2gF3hnz7Qqa5Ge1+Gvu2/fzUs3jTCv3Bqa08ce9vr3+NHH+UJM8bjphQP797q f9u1Jz3gnW/FyB23oWGlG28T/KfUibj015kwKHC3C6x6HFRsEVTLzAdR356WWIdTrR dMlNQbUjE8oIw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: David Howells , Sasha Levin , 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.10 04/13] rxrpc: Fix calc of resend age Date: Wed, 14 Sep 2022 05:03:06 -0400 Message-Id: <20220914090317.471116-4-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220914090317.471116-1-sashal@kernel.org> References: <20220914090317.471116-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: David Howells [ Upstream commit 214a9dc7d852216e83acac7b75bc18f01ce184c2 ] Fix the calculation of the resend age to add a microsecond value as microseconds, not nanoseconds. Signed-off-by: David Howells Signed-off-by: Sasha Levin --- 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