diff options
| author | David S. Miller <davem@davemloft.net> | 2017-09-21 11:44:45 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-09-21 11:44:45 -0700 |
| commit | ae3e24fd547e9f0b1443c1f004c29165180eb101 (patch) | |
| tree | 1483ff9602b04d34cd641a223624c4514721f76e /drivers/net/xen-netback/interface.c | |
| parent | 908a23efb76eed04f5b5173ecf09b6cbd05d886b (diff) | |
| parent | 19569c88b938145e90cc7d6ab45d7fa0edd07beb (diff) | |
Merge branch 'net-setup_timer'
Allen Pais says:
====================
net: use setup_timer() helper function.
This series uses setup_timer() helper function. The series
addresses the files under drivers/net/*.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/xen-netback/interface.c')
| -rw-r--r-- | drivers/net/xen-netback/interface.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/xen-netback/interface.c b/drivers/net/xen-netback/interface.c index ee8ed9da00ad..dcfcb153918c 100644 --- a/drivers/net/xen-netback/interface.c +++ b/drivers/net/xen-netback/interface.c @@ -520,8 +520,7 @@ int xenvif_init_queue(struct xenvif_queue *queue) queue->credit_bytes = queue->remaining_credit = ~0UL; queue->credit_usec = 0UL; - init_timer(&queue->credit_timeout); - queue->credit_timeout.function = xenvif_tx_credit_callback; + setup_timer(&queue->credit_timeout, xenvif_tx_credit_callback, 0UL); queue->credit_window_start = get_jiffies_64(); queue->rx_queue_max = XENVIF_RX_QUEUE_BYTES; |