diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2018-09-10 12:43:22 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2018-09-10 12:43:22 +1000 |
| commit | d33c680db1c567e860839fd0cdf1551ab8d98939 (patch) | |
| tree | 988a122eb98e17d1b3883ca264caa6a33277c3f3 | |
| parent | 0afeee82c19089cf2516a1924d338ee6948654e1 (diff) | |
| parent | b1ce023ae8a2137ac8a1413791ddf86e1b2675a7 (diff) | |
| download | linux-next-d33c680db1c567e860839fd0cdf1551ab8d98939.tar.gz | |
Merge remote-tracking branch 'ntb/ntb-next'
| -rw-r--r-- | drivers/net/ntb_netdev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ntb_netdev.c b/drivers/net/ntb_netdev.c index b12023bc2cab..df8d49ad48c3 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() |