diff options
| author | David S. Miller <davem@davemloft.net> | 2008-02-24 17:57:16 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-02-24 17:57:16 -0800 |
| commit | 323dbaba2cfab170c656f5d68986ff0ced5b421c (patch) | |
| tree | 99d2ef0d64df0036a4a9d2ef054b5bf20dd7fbd5 /drivers/net/virtio_net.c | |
| parent | bfa274e2436fc7ef72ef51c878083647f1cfd429 (diff) | |
| parent | 3bf319a787a881aa6ad8213b98b93b8de2b6f0e0 (diff) | |
Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/virtio_net.c')
| -rw-r--r-- | drivers/net/virtio_net.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index fdc23678117..19fd4cb0ddf 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: |