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 349B3C432C0 for ; Wed, 27 Nov 2019 21:03:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 09E0C215A5 for ; Wed, 27 Nov 2019 21:03:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574888627; bh=HUmds+9b5PGZVPdZ+yxdGP7APAcPSnss65fij7jLvqg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=QquyiqPOjFJHONK7qX1fesmHPmwHwgsQnDU0ruaTR+8TaKEyf1LYuJPV1fVL5erCy Vf+/o7c6guf7HUJXVoL0rZhTQIEW7P1Oj2CNri9c9VTpdcE2IF0M6XhqxOlEQKclfp Ma811Dw5+hsJQ7GEb8RrQ+SvxQQw8FKa9ccsMnr0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732074AbfK0VDp (ORCPT ); Wed, 27 Nov 2019 16:03:45 -0500 Received: from mail.kernel.org ([198.145.29.99]:57032 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732072AbfK0VDo (ORCPT ); Wed, 27 Nov 2019 16:03:44 -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 B11B12086A; Wed, 27 Nov 2019 21:03:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574888624; bh=HUmds+9b5PGZVPdZ+yxdGP7APAcPSnss65fij7jLvqg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vxHctKIpUpuTYucZ0a4Otqg03XfcI6+lXXCAS23no8OK1iy4TApROUqN4gnzLcjhd CkR4fdafo9vUC+ANgn22rRBqpMCWSFkHTPPLWZcDf61qiUxAA9kH5cxPFG5RTqtCI3 V+2AAE10nhfhrVz8HbSfwxGFQdyYAZXMfQ2P+AE4= 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.19 189/306] ntb_netdev: fix sleep time mismatch Date: Wed, 27 Nov 2019 21:30:39 +0100 Message-Id: <20191127203129.056658560@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191127203114.766709977@linuxfoundation.org> References: <20191127203114.766709977@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@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 b12023bc2cab5..df8d49ad48c38 100644 --- a/drivers/net/ntb_netdev.c +++ b/drivers/net/ntb_netdev.c @@ -236,7 +236,7 @@ static void ntb_netdev_tx_timer(struct timer_list *t) struct net_device *ndev = dev->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