diff options
| author | Kees Cook <keescook@chromium.org> | 2017-10-30 22:05:12 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-11-01 04:38:45 +0100 |
| commit | 2fd2f61e6d409f66d9f178ad708b9ced8defbf59 (patch) | |
| tree | a7ad7a1cd7e22685e96d388d50f5a28b1a191616 /drivers/net/ntb_netdev.c | |
| parent | bpf: avoid rcu_dereference inside bpf_event_mutex lock region (diff) | |
| download | linux-2fd2f61e6d409f66d9f178ad708b9ced8defbf59.tar.xz linux-2fd2f61e6d409f66d9f178ad708b9ced8defbf59.zip | |
drivers/net: ntb_netdev: Convert timers to use timer_setup()
In preparation for unconditionally passing the struct timer_list pointer to
all timer callbacks, switch to using the new timer_setup() and from_timer()
to pass the timer pointer explicitly.
Cc: Jon Mason <jdmason@kudzu.us>
Cc: Dave Jiang <dave.jiang@intel.com>
Cc: Allen Hubbe <Allen.Hubbe@emc.com>
Cc: linux-ntb@googlegroups.com
Cc: netdev@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ntb_netdev.c')
| -rw-r--r-- | drivers/net/ntb_netdev.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/ntb_netdev.c b/drivers/net/ntb_netdev.c index 0250aa9ae2cb..9f6f7ccd44f7 100644 --- a/drivers/net/ntb_netdev.c +++ b/drivers/net/ntb_netdev.c @@ -230,10 +230,10 @@ 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)); @@ -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); |