vhost-net: disable mergeable buffers

vhost in current kernels doesn't support mergeable buffers.
Disable this feature if vhost is enabled, until such
support is implemented.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
This commit is contained in:
Michael S. Tsirkin 2010-04-04 17:36:55 +03:00 committed by Aurelien Jarno
parent dc14a39781
commit 5751995a20

View File

@ -51,6 +51,7 @@ unsigned vhost_net_get_features(struct vhost_net *net, unsigned features)
if (!(net->dev.features & (1 << VIRTIO_RING_F_INDIRECT_DESC))) {
features &= ~(1 << VIRTIO_RING_F_INDIRECT_DESC);
}
features &= ~(1 << VIRTIO_NET_F_MRG_RXBUF);
return features;
}