aboutsummaryrefslogtreecommitdiff
path: root/drivers/net/xen-netfront.c
diff options
context:
space:
mode:
authorAlex Shi <alex.shi@linaro.org>2017-02-15 12:01:23 +0800
committerAlex Shi <alex.shi@linaro.org>2017-02-15 12:01:23 +0800
commit26c815656d14b133b04936f384f5a55fceb2e835 (patch)
tree32a8db278aa1c4f21e05fcc12bd57c831116bb78 /drivers/net/xen-netfront.c
parent106bdd9b95b3da7d762c4e0e59427444ff9f455d (diff)
parent57f53fd801a06aa1bfc6492737d70423ff9d3660 (diff)
downloadlinux-linaro-stable-lsk-v4.4-17.02-android.tar.gz
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-androidlsk-v4.4-17.02-android
Diffstat (limited to 'drivers/net/xen-netfront.c')
-rw-r--r--drivers/net/xen-netfront.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
index d6abf191122a..1f445f357da1 100644
--- a/drivers/net/xen-netfront.c
+++ b/drivers/net/xen-netfront.c
@@ -1391,6 +1391,8 @@ static void xennet_disconnect_backend(struct netfront_info *info)
for (i = 0; i < num_queues && info->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)) {
@@ -1745,7 +1747,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);
}