From e4fca7d6ff1a8f784336b04aff3278cb7fc76332 Mon Sep 17 00:00:00 2001 From: "Michael S. Tsirkin" Date: Fri, 24 Oct 2014 14:23:52 +0300 Subject: [PATCH] vhost/net: larger header for virtio 1.0 Signed-off-by: Michael S. Tsirkin Reviewed-by: Jason Wang Reviewed-by: Cornelia Huck --- drivers/vhost/net.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c index c218188c8880..8ff4a6dd2387 100644 --- a/drivers/vhost/net.c +++ b/drivers/vhost/net.c @@ -1030,7 +1030,8 @@ static int vhost_net_set_features(struct vhost_net *n, u64 features) size_t vhost_hlen, sock_hlen, hdr_len; int i; - hdr_len = (features & (1 << VIRTIO_NET_F_MRG_RXBUF)) ? + hdr_len = (features & ((1ULL << VIRTIO_NET_F_MRG_RXBUF) | + (1ULL << VIRTIO_F_VERSION_1))) ? sizeof(struct virtio_net_hdr_mrg_rxbuf) : sizeof(struct virtio_net_hdr); if (features & (1 << VHOST_NET_F_VIRTIO_NET_HDR)) { -- 2.39.5