Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net into net

[platform/adaptation/renesas_rcar/renesas_kernel.git] / drivers / net / xen-netback / interface.c

diff --git a/drivers/net/xen-netback/interface.c b/drivers/net/xen-netback/interface.c
index fc1b8d7..d984141 100644 (file)
--- a/drivers/net/xen-netback/interface.c
+++ b/drivers/net/xen-netback/interface.c
@@ -132,6 +132,7 @@ static void xenvif_up(struct xenvif *vif)
 static void xenvif_down(struct xenvif *vif)
 {
        disable_irq(vif->irq);
+       del_timer_sync(&vif->credit_timeout);
        xen_netbk_deschedule_xenvif(vif);
        xen_netbk_remove_xenvif(vif);
 }
@@ -365,8 +366,6 @@ void xenvif_disconnect(struct xenvif *vif)
        atomic_dec(&vif->refcnt);
        wait_event(vif->waiting_to_free, atomic_read(&vif->refcnt) == 0);
 
-       del_timer_sync(&vif->credit_timeout);
-
        if (vif->irq)
                unbind_from_irqhandler(vif->irq, vif);