]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
ntb_netdev: fix sleep time mismatch
authorJon Mason <jdmason@kudzu.us>
Mon, 11 Jun 2018 20:13:12 +0000 (16:13 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 1 Dec 2019 08:17:13 +0000 (09:17 +0100)
[ 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>
drivers/net/ntb_netdev.c

index b12023bc2cab5feb15ceedbe2fc357dfcf37627e..df8d49ad48c38ad9aaf5767878d96342f96d9b04 100644 (file)
@@ -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()