| Message ID | 20121210133725.cb4a76545691b099c73c40ea@canb.auug.org.au |
|---|---|
| State | Not Applicable, archived |
| Delegated to: | David Miller |
| Headers | show |
Stephen Rothwell <sfr@canb.auug.org.au> writes: > Hi Rusty, > > After merging the virtio tree, today's linux-next build (x86_64 > allmodconfig) failed like this: > > drivers/net/virtio_net.c: In function 'vq2txq': > drivers/net/virtio_net.c:150:2: error: implicit declaration of function 'virtqueue_get_queue_index' [-Werror=implicit-function-declaration] > > Caused by commit 986a4f4d452d ("virtio_net: multiqueue support") from the > net-next tree interacting with commit 105e892960e1 ("virtio: move > queue_index and num_free fields into core struct virtqueue") from the > virtio tree. > > I applied the patch below and can carry it as necessary. Thanks for this, your fix is correct. Cheers, Rusty. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 33d6f6f..8afe32d 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -147,7 +147,7 @@ struct padded_vnet_hdr { */ static int vq2txq(struct virtqueue *vq) { - return (virtqueue_get_queue_index(vq) - 1) / 2; + return (vq->index - 1) / 2; } static int txq2vq(int txq) @@ -157,7 +157,7 @@ static int txq2vq(int txq) static int vq2rxq(struct virtqueue *vq) { - return virtqueue_get_queue_index(vq) / 2; + return vq->index / 2; } static int rxq2vq(int rxq)
Hi Rusty, After merging the virtio tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/net/virtio_net.c: In function 'vq2txq': drivers/net/virtio_net.c:150:2: error: implicit declaration of function 'virtqueue_get_queue_index' [-Werror=implicit-function-declaration] Caused by commit 986a4f4d452d ("virtio_net: multiqueue support") from the net-next tree interacting with commit 105e892960e1 ("virtio: move queue_index and num_free fields into core struct virtqueue") from the virtio tree. I applied the patch below and can carry it as necessary. From: Stephen Rothwell <sfr@canb.auug.org.au> Date: Mon, 10 Dec 2012 13:33:57 +1100 Subject: [PATCH] virtnet: for up for virtqueue_get_queue_index removal Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> --- drivers/net/virtio_net.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)