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 1CE67C6FA8A for ; Wed, 14 Sep 2022 09:05:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230452AbiINJFW (ORCPT ); Wed, 14 Sep 2022 05:05:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47658 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230444AbiINJEj (ORCPT ); Wed, 14 Sep 2022 05:04:39 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9EB1778208; Wed, 14 Sep 2022 02:02:47 -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 dfw.source.kernel.org (Postfix) with ESMTPS id 6713461975; Wed, 14 Sep 2022 09:02:43 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id BCE5AC43141; Wed, 14 Sep 2022 09:02:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1663146162; bh=wWLBRCoyI+A/DImeDDnxC1KCwDlW7lSe99pqruGvWlY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YK0Ir5qodN57gTWG9kAsKS/Rlbg0GYvMFnHsW79a5NjCddew9sD5EIGCQB+RIyfdu H76ATnGYfJQ4OZr9A7hRswzg5dnY9rWdo1aKOV+ZZ/CzuVQa/Y/BgvRnnfwl7tyl4W 400isr8/Zv40p6XkMYjc8ApK2nDch2W6YZyoZLjBb5NvFKoBaYXefAmhProRX3zdMj a/wqwku5uFfnqdF4PGJEtSk0vk8qQI5RYrjoKMfnRXVTJUGLxiMZo4Vw2sXMCf+6L0 IEGYMFCu7Tq2Jg0lbFJK7Ib8MBet0o2s8iJ2l0O3ZvzLdQPnMQ+kM58foc6Kr29F// vdC0ny82Sz4Tw== 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.15 06/16] rxrpc: Fix calc of resend age Date: Wed, 14 Sep 2022 05:02:14 -0400 Message-Id: <20220914090224.470913-6-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220914090224.470913-1-sashal@kernel.org> References: <20220914090224.470913-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