diff options
author | David Vrabel <david.vrabel@citrix.com> | 2013-11-21 15:26:09 +0000 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-11-21 13:09:43 -0500 |
commit | db739ef37f07a1a12e388dbaec225d9d9d5d6ded (patch) | |
tree | 1afa3b07aa5e8ef07d5753fd9ee8c5290357c382 /drivers/net | |
parent | aec6f90d412fe30b88fdea3d1880734c837e15d4 (diff) | |
download | linux-stable-db739ef37f07a1a12e388dbaec225d9d9d5d6ded.tar.gz linux-stable-db739ef37f07a1a12e388dbaec225d9d9d5d6ded.tar.bz2 linux-stable-db739ef37f07a1a12e388dbaec225d9d9d5d6ded.zip |
xen-netback: stop the VIF thread before unbinding IRQs
If the VIF thread is still running after unbinding the Tx and Rx IRQs
in xenvif_disconnect(), the thread may attempt to raise an event which
will BUG (as the irq is unbound).
Signed-off-by: David Vrabel <david.vrabel@citrix.com>
Acked-by: Wei Liu <wei.liu2@citrix.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/xen-netback/interface.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/xen-netback/interface.c b/drivers/net/xen-netback/interface.c index b78ee10a956a..2329cccf1fa6 100644 --- a/drivers/net/xen-netback/interface.c +++ b/drivers/net/xen-netback/interface.c @@ -461,6 +461,9 @@ void xenvif_disconnect(struct xenvif *vif) if (netif_carrier_ok(vif->dev)) xenvif_carrier_off(vif); + if (vif->task) + kthread_stop(vif->task); + if (vif->tx_irq) { if (vif->tx_irq == vif->rx_irq) unbind_from_irqhandler(vif->tx_irq, vif); @@ -471,9 +474,6 @@ void xenvif_disconnect(struct xenvif *vif) vif->tx_irq = 0; } - if (vif->task) - kthread_stop(vif->task); - xenvif_unmap_frontend_rings(vif); } |