From: Christian Borntraeger Date: Mon, 18 Feb 2008 09:02:51 +0000 (+0100) Subject: virtio_net: Fix oops on early interrupts - introduced by virtio reset code X-Git-Tag: v2.6.25-rc4~148^2~41^2~18 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d9d5dcc88ca5c72237e2d09d23a13a9b9d1e7445;p=linux-2.6 virtio_net: Fix oops on early interrupts - introduced by virtio reset code Signed-off-by: Jeff Garzik --- diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index fdc2367811..19fd4cb0dd 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -361,6 +361,7 @@ static int virtnet_probe(struct virtio_device *vdev) netif_napi_add(dev, &vi->napi, virtnet_poll, napi_weight); vi->dev = dev; vi->vdev = vdev; + vdev->priv = vi; /* We expect two virtqueues, receive then send. */ vi->rvq = vdev->config->find_vq(vdev, 0, skb_recv_done); @@ -395,7 +396,6 @@ static int virtnet_probe(struct virtio_device *vdev) } pr_debug("virtnet: registered device %s\n", dev->name); - vdev->priv = vi; return 0; unregister: