[PATCH] virtio_net: don't require ANY_LAYOUT with VERSION_1

From	"Michael S. Tsirkin" <mst@redhat.com>
Newsgroups	linux.kernel
Subject	[PATCH] virtio_net: don't require ANY_LAYOUT with VERSION_1
Date	2015-07-15 14:30 +0200
Message-ID	<pMtZ0-7p7-5@gated-at.bofh.it> (permalink)
Organization	linux.* mail to news gateway

Show all headers | View raw

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: Michael S. Tsirkin <mst@redhat.com>
---
 drivers/net/virtio_net.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index 63c7810..7fbca37 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -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))
-- 
MST
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH] virtio_net: don't require ANY_LAYOUT with VERSION_1 "Michael S. Tsirkin" <mst@redhat.com> - 2015-07-15 14:30 +0200
  Re: [virtio-dev] [PATCH] virtio_net: don't require ANY_LAYOUT with  VERSION_1 Paolo Bonzini <pbonzini@redhat.com> - 2015-07-15 15:00 +0200
  Re: [virtio-dev] [PATCH] virtio_net: don't require ANY_LAYOUT with  VERSION_1 Stefan Hajnoczi <stefanha@redhat.com> - 2015-07-16 12:30 +0200

csiph-web