From: Michael S. Tsirkin Date: Thu, 23 Oct 2014 21:24:03 +0000 (+0300) Subject: virtio_net: bigger header when VERSION_1 is set X-Git-Tag: firefly_0821_release~176^2~2624^2~60 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=d04302b334bde9da691bd823d239cfd26f33e2fb;p=firefly-linux-kernel-4.4.55.git 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: Michael S. Tsirkin Reviewed-by: Cornelia Huck Reviewed-by: Jason Wang --- diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 098f4432afa1..a0e64cfdbc24 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -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);