aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/xen-netback/interface.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/xen-netback/interface.c')
-rw-r--r--drivers/net/xen-netback/interface.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/xen-netback/interface.c b/drivers/net/xen-netback/interface.c
index fc1b8d78f4bc..d98414168485 100644
--- 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)
132static void xenvif_down(struct xenvif *vif) 132static void xenvif_down(struct xenvif *vif)
133{ 133{
134 disable_irq(vif->irq); 134 disable_irq(vif->irq);
135 del_timer_sync(&vif->credit_timeout);
135 xen_netbk_deschedule_xenvif(vif); 136 xen_netbk_deschedule_xenvif(vif);
136 xen_netbk_remove_xenvif(vif); 137 xen_netbk_remove_xenvif(vif);
137} 138}
@@ -365,8 +366,6 @@ void xenvif_disconnect(struct xenvif *vif)
365 atomic_dec(&vif->refcnt); 366 atomic_dec(&vif->refcnt);
366 wait_event(vif->waiting_to_free, atomic_read(&vif->refcnt) == 0); 367 wait_event(vif->waiting_to_free, atomic_read(&vif->refcnt) == 0);
367 368
368 del_timer_sync(&vif->credit_timeout);
369
370 if (vif->irq) 369 if (vif->irq)
371 unbind_from_irqhandler(vif->irq, vif); 370 unbind_from_irqhandler(vif->irq, vif);
372 371