summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorChristian Borntraeger <borntraeger@de.ibm.com>2008-02-18 10:02:51 +0100
committerJeff Garzik <jeff@garzik.org>2008-02-23 23:55:04 -0500
commitd9d5dcc88ca5c72237e2d09d23a13a9b9d1e7445 (patch)
tree9f27542240c28c952b47148ff428cd7ff10d6710 /drivers
parent7a7d23dac29825a75e375800573d53e49d864a42 (diff)
downloadblackbird-op-linux-d9d5dcc88ca5c72237e2d09d23a13a9b9d1e7445.tar.gz
blackbird-op-linux-d9d5dcc88ca5c72237e2d09d23a13a9b9d1e7445.zip
virtio_net: Fix oops on early interrupts - introduced by virtio reset code
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/virtio_net.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index fdc23678117b..19fd4cb0ddf8 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:
OpenPOWER on IntegriCloud