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

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

virtio_net: bigger header when VERSION_1 is set 



With VERSION_1 virtio_net uses same header size
whether mergeable buffers are enabled or not.

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

drivers/net/virtio_net.c

+2 −1
Original line number Diff line number Diff line
@@ -1805,7 +1805,8 @@ static int virtnet_probe(struct virtio_device *vdev) 
	if (virtio_has_feature(vdev, VIRTIO_NET_F_MRG_RXBUF))

		vi->mergeable_rx_bufs = true;



	if (virtio_has_feature(vdev, VIRTIO_NET_F_MRG_RXBUF))

	if (virtio_has_feature(vdev, VIRTIO_NET_F_MRG_RXBUF) ||

	    virtio_has_feature(vdev, VIRTIO_F_VERSION_1))

		vi->hdr_len = sizeof(struct virtio_net_hdr_mrg_rxbuf);

	else

		vi->hdr_len = sizeof(struct virtio_net_hdr);