rtl8xxxu: fix interface sanity check

[mirror_ubuntu-bionic-kernel.git] / drivers / net / ntb_netdev.c

diff --git a/drivers/net/ntb_netdev.c b/drivers/net/ntb_netdev.c
index 0250aa9ae2cbc9b0878c89b856f3b591dea3b0a5..306a662eba9400af21a25fb29edd5f8105257697 100644 (file)
--- a/drivers/net/ntb_netdev.c
+++ b/drivers/net/ntb_netdev.c
@@ -230,13 +230,13 @@ err:
        return NETDEV_TX_BUSY;
 }
 
-static void ntb_netdev_tx_timer(unsigned long data)
+static void ntb_netdev_tx_timer(struct timer_list *t)
 {
-       struct net_device *ndev = (struct net_device *)data;
-       struct ntb_netdev *dev = netdev_priv(ndev);
+       struct ntb_netdev *dev = from_timer(dev, t, tx_timer);
+       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()
@@ -269,7 +269,7 @@ static int ntb_netdev_open(struct net_device *ndev)
                }
        }
 
-       setup_timer(&dev->tx_timer, ntb_netdev_tx_timer, (unsigned long)ndev);
+       timer_setup(&dev->tx_timer, ntb_netdev_tx_timer, 0);
 
        netif_carrier_off(ndev);
        ntb_transport_link_up(dev->qp);