Commit e4fca7d6 authored by Michael S. Tsirkin's avatar Michael S. Tsirkin
Browse files

vhost/net: larger header for virtio 1.0 



Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Reviewed-by: default avatarJason Wang <jasowang@redhat.com>
Reviewed-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
parent 8b38694a

drivers/vhost/net.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -1030,7 +1030,8 @@ static int vhost_net_set_features(struct vhost_net *n, u64 features) 
	size_t vhost_hlen, sock_hlen, hdr_len;

	size_t vhost_hlen, sock_hlen, hdr_len;

	int i;

	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_mrg_rxbuf) :

			sizeof(struct virtio_net_hdr);

			sizeof(struct virtio_net_hdr);

	if (features & (1 << VHOST_NET_F_VIRTIO_NET_HDR)) {

	if (features & (1 << VHOST_NET_F_VIRTIO_NET_HDR)) {