summaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorJon Mason <jdmason@kudzu.us>2018-06-11 16:13:12 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-11-28 18:25:58 +0100
commite348885bd406b7a2c387165a953ad15f0db79b33 (patch)
treed9cec303dab2cffeda6c8d2bd3c29c89dfc75823 /drivers/net
parenteb517bafc9ecdb9cb753b8605d4077af9e04eb95 (diff)
ntb_netdev: fix sleep time mismatch
[ 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 <gerd.haeussler@cesys-it.com> Signed-off-by: Jon Mason <jdmason@kudzu.us> Acked-by: Dave Jiang <dave.jiang@intel.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/ntb_netdev.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ntb_netdev.c b/drivers/net/ntb_netdev.c
index a9acf7156855..03009f1becdd 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()