xen-netfront: Delete rx_refill_timer in xennet_disconnect_backend()

[pandora-kernel.git] / drivers / net / xen-netfront.c

diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
index c64a60e..47a4046 100644 (file)
--- a/drivers/net/xen-netfront.c
+++ b/drivers/net/xen-netfront.c
@@ -1404,6 +1404,8 @@ static void xennet_disconnect_backend(struct netfront_info *info)
        spin_unlock_irq(&info->tx_lock);
        spin_unlock_bh(&info->rx_lock);
 
+       del_timer_sync(&info->rx_refill_timer);
+
        if (info->netdev->irq)
                unbind_from_irqhandler(info->netdev->irq, info->netdev);
        info->evtchn = info->netdev->irq = 0;
@@ -1940,8 +1942,6 @@ static int __devexit xennet_remove(struct xenbus_device *dev)
 
        unregister_netdev(info->netdev);
 
-       del_timer_sync(&info->rx_refill_timer);
-
        free_percpu(info->stats);
 
        free_netdev(info->netdev);