Received: by 2002:a05:6358:45e:b0:b5:b6eb:e1f9 with SMTP id 30csp418450rwe; Thu, 1 Sep 2022 01:30:43 -0700 (PDT) X-Google-Smtp-Source: AA6agR5oAw2jW//rfxzfzbHqpM+OP19FAtpELejjMUiAla7dbg4WP+fqwR3E8nueNYcH/hZiAvfR X-Received: by 2002:aa7:8e4b:0:b0:535:da7c:c2d with SMTP id d11-20020aa78e4b000000b00535da7c0c2dmr30134368pfr.86.1662021043348; Thu, 01 Sep 2022 01:30:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1662021043; cv=none; d=google.com; s=arc-20160816; b=lcONzmsjoth23/yJufKDkDmrSSgj5yyeFrCsX+pJ3pTu1rb+avIJe5UQbSIWEltJeD 5qsCGqwjevNBE9zxxeGnsX4/oBEzOWwjF9FRz8SvtfVJNQhStbXvINTRYgu+x0q1xLX8 0gn/K0tkM19Q+fqRhA6cpLBAqWmTcZVnx8iBcjH57Iz4GnXwqaxVY9a78wnSJ2DN2wY7 prMntc5kjAgFejZavNyUCTKxR/a+1gg2c2cHM26RhAcmPP63SenesSIDygu06FQiyk9O fetUe68tW5yx23dWSh0coBuHMahvuovVYuibVyMB4rekd52BNglKwrvnYo7rRD34DAlh 8JSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:cc:to:from :subject:organization:dkim-signature; bh=+R3oRbS1dr4Hw0Byg+WK1FYsd3bdoErBD0TzikrgHgY=; b=vnwTXR6tRMLqSNs63l/oR4Hl4uh5LdO5sge+qTBmL78428vNN3H2PtxhXVaeALQN2E EJcP8nytgsILiZedn4LdU/TVlf8umQpjjjTLj65IBFA4YyIkiM2JD2RHZ2YP+nMDIrdD btd/VkZ9Xd0JTfWXPLj8PHbLJqHVyPX8JtPMuWr3/B7fPo6Ku061idw2GN2o7dRMCp6+ cfQ9btBgymn4e1CPXCBQzdXTxiwnSo8riqwGDB6mO+42NOS2P7gxBL0G7kF1RvRlFLCw u54dejY7Yp/3DBBYR0Nb4MJYcI0qxaIynXwSm69jkVAARp2MorMjZbewGrmuMMe5EQ5L Al5Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=DaGK5tXV; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id c15-20020a170903234f00b0016efa52d3ffsi18498064plh.241.2022.09.01.01.30.32; Thu, 01 Sep 2022 01:30:43 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=DaGK5tXV; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233689AbiIAIID (ORCPT + 99 others); Thu, 1 Sep 2022 04:08:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33510 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233501AbiIAIH4 (ORCPT ); Thu, 1 Sep 2022 04:07:56 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C9079E42DA for ; Thu, 1 Sep 2022 01:07:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1662019673; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+R3oRbS1dr4Hw0Byg+WK1FYsd3bdoErBD0TzikrgHgY=; b=DaGK5tXViC3/73VAxAkqTYZemj2jbbGZsbQc1unhGJtpDjHDFVkNwmpXzWTuAaX5jfoppC mOANDSKp7nqoi7lV1Hv1vnbbcYV3Ectz2cWzHhjctF49ItgXCjGSSYtjj6OvqwP3VzEVp9 9lGzsAdunON6IdFlkewTJjAvpkUkup4= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-636-d_5Uf6JbMxeomBd_tWQEQg-1; Thu, 01 Sep 2022 04:07:51 -0400 X-MC-Unique: d_5Uf6JbMxeomBd_tWQEQg-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 958A83C10231; Thu, 1 Sep 2022 08:07:51 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.33.36.72]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1822A401473; Thu, 1 Sep 2022 08:07:50 +0000 (UTC) Organization: Red Hat UK Ltd. Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SI4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 3798903 Subject: [PATCH net 4/6] rxrpc: Fix calc of resend age From: David Howells To: netdev@vger.kernel.org Cc: dhowells@redhat.com, linux-afs@lists.infradead.org, linux-kernel@vger.kernel.org Date: Thu, 01 Sep 2022 09:07:50 +0100 Message-ID: <166201967050.3817988.4307733641865890404.stgit@warthog.procyon.org.uk> In-Reply-To: <166201964443.3817988.12088441548413332725.stgit@warthog.procyon.org.uk> References: <166201964443.3817988.12088441548413332725.stgit@warthog.procyon.org.uk> User-Agent: StGit/1.5 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.85 on 10.11.54.10 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Fix the calculation of the resend age to add a microsecond value as microseconds, not nanoseconds. Signed-off-by: David Howells --- 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 f8ecad2b730e..2a93e7b5fbd0 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);