aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/virtio_net.c
diff options
context:
space:
mode:
authorRusty Russell <rusty@rustcorp.com.au>2009-06-13 00:16:35 -0400
committerRusty Russell <rusty@rustcorp.com.au>2009-06-12 08:46:36 -0400
commit9499f5e7ed5224c40706f0cec6542a9916bc7606 (patch)
tree3e4e1b36d3d549ea356e88e6e44359a887c6ee01 /drivers/net/virtio_net.c
parentef688e151c00e5d529703be9a04fd506df8bc54e (diff)
virtio: add names to virtqueue struct, mapping from devices to queues.
Add a linked list of all virtqueues for a virtio device: this helps for debugging and is also needed for upcoming interface change. Also, add a "name" field for clearer debug messages. Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Diffstat (limited to 'drivers/net/virtio_net.c')
-rw-r--r--drivers/net/virtio_net.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index 4d1d47953fc6..be3b734ff5a1 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -906,20 +906,20 @@ static int virtnet_probe(struct virtio_device *vdev)
906 vi->mergeable_rx_bufs = true; 906 vi->mergeable_rx_bufs = true;
907 907
908 /* We expect two virtqueues, receive then send. */ 908 /* We expect two virtqueues, receive then send. */
909 vi->rvq = vdev->config->find_vq(vdev, 0, skb_recv_done); 909 vi->rvq = vdev->config->find_vq(vdev, 0, skb_recv_done, "input");
910 if (IS_ERR(vi->rvq)) { 910 if (IS_ERR(vi->rvq)) {
911 err = PTR_ERR(vi->rvq); 911 err = PTR_ERR(vi->rvq);
912 goto free; 912 goto free;
913 } 913 }
914 914
915 vi->svq = vdev->config->find_vq(vdev, 1, skb_xmit_done); 915 vi->svq = vdev->config->find_vq(vdev, 1, skb_xmit_done, "output");
916 if (IS_ERR(vi->svq)) { 916 if (IS_ERR(vi->svq)) {
917 err = PTR_ERR(vi->svq); 917 err = PTR_ERR(vi->svq);
918 goto free_recv; 918 goto free_recv;
919 } 919 }
920 920
921 if (virtio_has_feature(vi->vdev, VIRTIO_NET_F_CTRL_VQ)) { 921 if (virtio_has_feature(vi->vdev, VIRTIO_NET_F_CTRL_VQ)) {
922 vi->cvq = vdev->config->find_vq(vdev, 2, NULL); 922 vi->cvq = vdev->config->find_vq(vdev, 2, NULL, "control");
923 if (IS_ERR(vi->cvq)) { 923 if (IS_ERR(vi->cvq)) {
924 err = PTR_ERR(vi->svq); 924 err = PTR_ERR(vi->svq);
925 goto free_send; 925 goto free_send;