diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-03-20 12:02:29 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-03-20 12:02:29 +0800 |
| commit | 018ed21cf3b7cb618c63294793d63b23ce4afe24 (patch) | |
| tree | 74dbac7cbb2288e8683ea5295cbf1aac42ab41c5 /drivers/net/xen-netfront.c | |
| parent | d661f15677f5205c1d272c2db90b60b2d56b25dd (diff) | |
| parent | d97f745e1d2fea4d2f308e5e06eee81a9a84f3f5 (diff) | |
Merge branch 'linux-linaro-lsk-v4.1' into linux-linaro-lsk-v4.1-androidlsk-v4.1-17.03-android
Diffstat (limited to 'drivers/net/xen-netfront.c')
| -rw-r--r-- | drivers/net/xen-netfront.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c index fd51626e859e..ea1be52f5515 100644 --- a/drivers/net/xen-netfront.c +++ b/drivers/net/xen-netfront.c @@ -1344,6 +1344,8 @@ static void xennet_disconnect_backend(struct netfront_info *info) for (i = 0; i < num_queues; ++i) { struct netfront_queue *queue = &info->queues[i]; + del_timer_sync(&queue->rx_refill_timer); + if (queue->tx_irq && (queue->tx_irq == queue->rx_irq)) unbind_from_irqhandler(queue->tx_irq, queue); if (queue->tx_irq && (queue->tx_irq != queue->rx_irq)) { @@ -1699,7 +1701,6 @@ static void xennet_destroy_queues(struct netfront_info *info) if (netif_running(info->netdev)) napi_disable(&queue->napi); - del_timer_sync(&queue->rx_refill_timer); netif_napi_del(&queue->napi); } |