From: Mark McLoughlin Date: Thu, 18 Jun 2009 10:31:07 +0000 (+0100) Subject: virtio-net: enable mergeable receive buffers X-Git-Tag: v0.11.0-rc0~313 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e16044ef2ee8641ec72dc3476561604e68eb264f;p=thirdparty%2Fqemu.git virtio-net: enable mergeable receive buffers When virtio-net was merged in from qemu-kvm.git, the VNET_HDR related features were dropped from the code. However, VIRTIO_NET_F_MRG_RXBUF appears to have accidentally been dropped too. Re-instate that now. Reported-by: Michael S. Tsirkin Signed-off-by: Mark McLoughlin Signed-off-by: Anthony Liguori --- diff --git a/hw/virtio-net.c b/hw/virtio-net.c index d584287a519..e1efbbeaf46 100644 --- a/hw/virtio-net.c +++ b/hw/virtio-net.c @@ -119,6 +119,7 @@ static void virtio_net_reset(VirtIODevice *vdev) static uint32_t virtio_net_get_features(VirtIODevice *vdev) { uint32_t features = (1 << VIRTIO_NET_F_MAC) | + (1 << VIRTIO_NET_F_MRG_RXBUF) | (1 << VIRTIO_NET_F_STATUS) | (1 << VIRTIO_NET_F_CTRL_VQ) | (1 << VIRTIO_NET_F_CTRL_RX) |