Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

[linux-2.6-microblaze.git] / drivers / net / virtio_net.c

diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index 668685c..21b7114 100644 (file)
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -2610,12 +2610,11 @@ static void virtnet_free_queues(struct virtnet_info *vi)
        int i;
 
        for (i = 0; i < vi->max_queue_pairs; i++) {
-               napi_hash_del(&vi->rq[i].napi);
-               netif_napi_del(&vi->rq[i].napi);
-               netif_napi_del(&vi->sq[i].napi);
+               __netif_napi_del(&vi->rq[i].napi);
+               __netif_napi_del(&vi->sq[i].napi);
        }
 
-       /* We called napi_hash_del() before netif_napi_del(),
+       /* We called __netif_napi_del(),
         * we need to respect an RCU grace period before freeing vi->rq
         */
        synchronize_net();