aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/xen-netback
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/xen-netback')
-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 b8c5193bd420..221f4265f7d6 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}
@@ -363,8 +364,6 @@ void xenvif_disconnect(struct xenvif *vif)
363 atomic_dec(&vif->refcnt); 364 atomic_dec(&vif->refcnt);
364 wait_event(vif->waiting_to_free, atomic_read(&vif->refcnt) == 0); 365 wait_event(vif->waiting_to_free, atomic_read(&vif->refcnt) == 0);
365 366
366 del_timer_sync(&vif->credit_timeout);
367
368 if (vif->irq) 367 if (vif->irq)
369 unbind_from_irqhandler(vif->irq, vif); 368 unbind_from_irqhandler(vif->irq, vif);
370 369