Re: [PATCH v6 33/46] vhost/net: larger header for virtio 1.0
From: Jason Wang <hidden>
Date: 2014-11-28 08:38:37
Also in:
kvm, lkml, netdev
On Fri, Nov 28, 2014 at 4:10 AM, Michael S. Tsirkin [off-list ref] wrote:
quoted hunk
Signed-off-by: Michael S. Tsirkin <mst@redhat.com> --- 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 cae22f9..1ac58d0 100644 --- a/drivers/vhost/net.c +++ b/drivers/vhost/net.c@@ -1027,7 +1027,8 @@ static int vhost_net_set_features(structvhost_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)) { -- MST
Reviewed-by: Jason Wang <redacted>