diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2018-09-18 13:52:24 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2018-09-18 13:52:24 +1000 |
| commit | 6d834c655c546568984626d979539c1229e6b476 (patch) | |
| tree | 3f9c246d8b3d4177a7702aa62049dcdb62a0127c | |
| parent | 4970605094c9b437bb9c38d6cc8c21de56e19503 (diff) | |
| parent | b1ce023ae8a2137ac8a1413791ddf86e1b2675a7 (diff) | |
| download | linux-next-6d834c655c546568984626d979539c1229e6b476.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() |