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=ham 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 542E1C432C3 for ; Sat, 16 Nov 2019 15:57:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1FF4821479 for ; Sat, 16 Nov 2019 15:57:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573919843; bh=QI1gw+r06sE5VELa9ZX/A+y3EYDXLyXaTUSzj6BhIYo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=HM3Subv/xmdRsbucyz5dSGIyYyWKfkmxY8R44+XAzBMGP52T6/syeAMQ9cscRQfbE 9bCIhnphI5QiCM9CW5lqS377YUb5k1inide33EGaG+mzziB3Too06eEzMfp1WnRCMs Tq3nODB78CZ0SxMC5eSaz8RKdXpjBnxe4F4kybpg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730831AbfKPP5V (ORCPT ); Sat, 16 Nov 2019 10:57:21 -0500 Received: from mail.kernel.org ([198.145.29.99]:37074 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731549AbfKPPzK (ORCPT ); Sat, 16 Nov 2019 10:55:10 -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 8A739218AE; Sat, 16 Nov 2019 15:55:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573919709; bh=QI1gw+r06sE5VELa9ZX/A+y3EYDXLyXaTUSzj6BhIYo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=df+gwyF/oy9LqWxPOIxACxoCgsuAdRwraG68Quz+qwin/VqdPCNl8YyIPzUEmrfbe HeBQqcjAQROr1XFIxEsUVHpPZ/lj8toTHxqe/yFWwCQOvWCBJDcrCBSEt4FKb31VVk 4csIiQAwpXiGUvxwDYtkPOfUu/Lv2GwNJvEQkX7E= 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.4 54/77] ntb_netdev: fix sleep time mismatch Date: Sat, 16 Nov 2019 10:53:16 -0500 Message-Id: <20191116155339.11909-54-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191116155339.11909-1-sashal@kernel.org> References: <20191116155339.11909-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 a9acf71568555..03009f1becddc 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