commit e16044ef2ee8641ec72dc3476561604e68eb264f
author Mark McLoughlin <markmc@redhat.com> Thu Jun 18 11:31:07 2009 +0100
committer Anthony Liguori <aliguori@us.ibm.com> Mon Jun 22 10:15:28 2009 -0500
tree df064ff7529778cbf12f0957e3aae2246ea876ab
parent 9d5e77a22f1b8b502a11aa6288334c2787d8dbc8

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 <mst@redhat.com>
Signed-off-by: Mark McLoughlin <markmc@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

hw/virtio-net.c

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 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) |