diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-12-07 00:39:39 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-12-07 00:39:39 +0300 |
| commit | d6eabce2577a695197e9433302fd6a9f0e1a7666 (patch) | |
| tree | e5c5bcc7803879d5d911cc8faeb74a946c242395 /drivers/net/xen-netback/interface.c | |
| parent | 6e948c67c47211afcc65c9ccdeedbd5db5c57077 (diff) | |
| parent | 328b4ed93b69a6f2083d52f31a240a09e5de386a (diff) | |
| download | linux-d6eabce2577a695197e9433302fd6a9f0e1a7666.tar.xz | |
Merge branch 'linus' into perf/urgent, to synchronize UAPI headers
Signed-off-by: Ingo Molnar <mingo@kernel.org>
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 4491ca5aee90..d6dff347f896 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; + timer_setup(&queue->credit_timeout, xenvif_tx_credit_callback, 0); queue->credit_window_start = get_jiffies_64(); queue->rx_queue_max = XENVIF_RX_QUEUE_BYTES; |