[Qemu-commits] [COMMIT e16044e] virtio-net: enable mergeable receive buffers

[Anthony Liguori]

From: Mark McLoughlin <address@hidden>

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 <address@hidden>
Signed-off-by: Mark McLoughlin <address@hidden>
Signed-off-by: Anthony Liguori <address@hidden>

diff --git a/hw/virtio-net.c b/hw/virtio-net.c
index d584287..e1efbbe 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) |