Stephen Rothwell <s...@canb.auug.org.au> writes:
> The virtio tree
> (git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux.git#virtio-next)
> has a conflict with the net-next tree
> (git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git#master)
> that requires the following extra fix up patch:
>
> 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;
> }
I had to fold in a fix to another commit, so I also altered the commit
which removed virtqueue_get_queue_index(). I'll remove it next time.
I'll give it a couple of days in -next to be sure.
Thanks,
Rusty.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
