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 X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 37CE5C432C3 for ; Sat, 16 Nov 2019 16:08:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0DD3C206C0 for ; Sat, 16 Nov 2019 16:08:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573920533; bh=wu8iWbB/vI5j91N6tp1uS1uxExscGnc+y38dgtOkPU8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=cV45ovAbnhwsSB1de4DiE01ErRYbi6qfnymxJOSSulFwTWAM3ExIv7h5mlS09EOgw q3MWBuAhyU2jnzYnYHLCnp1izUP78bqHBqoKhhXQ87tkVECdW4u3RLiHHkOczE6zcm Km4EV0OVHkXGIkbnfKkm4fGv4t4NnmY++iMK2Bgc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731711AbfKPQIf (ORCPT ); Sat, 16 Nov 2019 11:08:35 -0500 Received: from mail.kernel.org ([198.145.29.99]:58044 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730430AbfKPPuJ (ORCPT ); Sat, 16 Nov 2019 10:50:09 -0500 Received: from sasha-vm.mshome.net (unknown [50.234.116.4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id F068F208CE; Sat, 16 Nov 2019 15:50:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573919409; bh=wu8iWbB/vI5j91N6tp1uS1uxExscGnc+y38dgtOkPU8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Eg0WVi8nFruoaQCFLLbI8GFET/PYIE/Gamu8qS2OasruC6StqLX5ZDrgmP4qIMMiE 99hNh+CbaMU+ae94hhcCbfTpueB4MU0AUxbvrmv6AhuoP6KjUgWwxXTyJ+VxNsLpJM 1t6+taH/HutUxQ9gwu5wvrUed8bN9fHidnkiUepI= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Jon Mason , "Gerd W . Haeussler" , Dave Jiang , Sasha Levin , linux-ntb@googlegroups.com, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.14 107/150] ntb_netdev: fix sleep time mismatch Date: Sat, 16 Nov 2019 10:46:45 -0500 Message-Id: <20191116154729.9573-107-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191116154729.9573-1-sashal@kernel.org> References: <20191116154729.9573-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jon Mason [ Upstream commit a861594b1b7ffd630f335b351c4e9f938feadb8e ] The tx_time should be in usecs (according to the comment above the variable), but the setting of the timer during the rearming is done in msecs. Change it to match the expected units. Fixes: e74bfeedad08 ("NTB: Add flow control to the ntb_netdev") Suggested-by: Gerd W. Haeussler Signed-off-by: Jon Mason Acked-by: Dave Jiang Signed-off-by: Sasha Levin --- drivers/net/ntb_netdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ntb_netdev.c b/drivers/net/ntb_netdev.c index 0250aa9ae2cbc..97bf49ad81a6d 100644 --- a/drivers/net/ntb_netdev.c +++ b/drivers/net/ntb_netdev.c @@ -236,7 +236,7 @@ static void ntb_netdev_tx_timer(unsigned long data) struct ntb_netdev *dev = netdev_priv(ndev); if (ntb_transport_tx_free_entry(dev->qp) < tx_stop) { - mod_timer(&dev->tx_timer, jiffies + msecs_to_jiffies(tx_time)); + mod_timer(&dev->tx_timer, jiffies + usecs_to_jiffies(tx_time)); } else { /* Make sure anybody stopping the queue after this sees the new * value of ntb_transport_tx_free_entry() -- 2.20.1