xen-netback: delete NAPI instance when queue fails to initialize

When xenvif_connect() fails it may leave a stale NAPI instance added to
the device.  Make sure we delete it in the error path.

Signed-off-by: David Vrabel <david.vrabel@citrix.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
(cherry picked from commit 4a658527271bce43afb1cf4feec89afe6716ca59)
Signed-off-by: Daniel Kiper <daniel.kiper@oracle.com>

diff --git a/drivers/net/xen-netback/interface.c b/drivers/net/xen-netback/interface.c
index e7bd63eb2876ed245a6ece5c8f24f826fb6493ed..3bba6ceee1328913299f9514ad2efe3f95dd57fa 100644 (file)
--- a/drivers/net/xen-netback/interface.c
+++ b/drivers/net/xen-netback/interface.c
@@ -615,6 +615,7 @@ err_tx_unbind:
        queue->tx_irq = 0;
 err_unmap:
        xenvif_unmap_frontend_rings(queue);
+       netif_napi_del(&queue->napi);
 err:
        module_put(THIS_MODULE);
        return err;