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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,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 5FA59C432C0 for ; Wed, 27 Nov 2019 21:34:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2910C20665 for ; Wed, 27 Nov 2019 21:34:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574890468; bh=wu8iWbB/vI5j91N6tp1uS1uxExscGnc+y38dgtOkPU8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=nM1SovyuMAjI9T4gTT9DDVdbsyY8nhgIXfKbGBa9cGKzkZQzblIF22CVI0nOIThND ldcrKqsTuDWk3E1zTAYPl+H7V3EbiTeQ84ILQKqLBmBfDjdtIyOphuFtDwLJcpAu+O WrGv65V+yRcUk7R9Epj9Y0bAqD+iJfPGzxJk4zZc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730503AbfK0Ve0 (ORCPT ); Wed, 27 Nov 2019 16:34:26 -0500 Received: from mail.kernel.org ([198.145.29.99]:37306 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730412AbfK0Uu5 (ORCPT ); Wed, 27 Nov 2019 15:50:57 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id B1C9421871; Wed, 27 Nov 2019 20:50:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574887857; bh=wu8iWbB/vI5j91N6tp1uS1uxExscGnc+y38dgtOkPU8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=y/eLl+RZPL83SVWckG/gNA/xtLOMId5ATqtIQPY43PzIamoJbmOW2/eI0kahfAVbU EA8Kbfj9Gi0iawtTZ5i9hK/pQhSgfArTx/GO+JCedtNlVxiD2Fwg6hO5Nne6PXHOaW XveOo1LMfWS+OwqEl+7j1Cl4BZGKRIixMByADrdY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, "Gerd W. Haeussler" , Jon Mason , Dave Jiang , Sasha Levin Subject: [PATCH 4.14 121/211] ntb_netdev: fix sleep time mismatch Date: Wed, 27 Nov 2019 21:30:54 +0100 Message-Id: <20191127203105.588112666@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191127203049.431810767@linuxfoundation.org> References: <20191127203049.431810767@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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 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