Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 75993300 authored by Michael S. Tsirkin's avatar Michael S. Tsirkin Committed by David S. Miller
Browse files

virtio_net: don't require ANY_LAYOUT with VERSION_1 



ANY_LAYOUT is a compatibility feature. It's implied
for VERSION_1 devices, and non-transitional devices
might not offer it. Change code to behave accordingly.

Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Reviewed-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Reviewed-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e2370f07

drivers/net/virtio_net.c

+2 −1
Original line number Diff line number Diff line
@@ -1828,7 +1828,8 @@ static int virtnet_probe(struct virtio_device *vdev) 
	else

		vi->hdr_len = sizeof(struct virtio_net_hdr);



	if (virtio_has_feature(vdev, VIRTIO_F_ANY_LAYOUT))

	if (virtio_has_feature(vdev, VIRTIO_F_ANY_LAYOUT) ||

	    virtio_has_feature(vdev, VIRTIO_F_VERSION_1))

		vi->any_header_sg = true;



	if (virtio_has_feature(vdev, VIRTIO_NET_F_CTRL_VQ))