From 3d671af711e823e7413f93b8f7a172f9d59d69a7 Mon Sep 17 00:00:00 2001 From: Huawei Xie Date: Thu, 9 Oct 2014 02:54:53 +0800 Subject: [PATCH] vhost: supported features VHOST_SUPPORTED_FEATURES is the feature mask that vhost lib supports. VHOST_FEATURES is the feature mask vhost currently supports after some features are turned on/off. Signed-off-by: Huawei Xie Acked-by: Changchun Ouyang [Thomas: split patch] --- lib/librte_vhost/virtio-net.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/librte_vhost/virtio-net.c b/lib/librte_vhost/virtio-net.c index de505c5223..127270ccfd 100644 --- a/lib/librte_vhost/virtio-net.c +++ b/lib/librte_vhost/virtio-net.c @@ -68,8 +68,9 @@ static struct virtio_net_device_ops const * notify_ops; /* Root address of the linked list in the configuration core. */ static struct virtio_net_config_ll *ll_root = NULL; -/* Features supported by this application. RX merge buffers are disabled by default. */ -uint64_t VHOST_FEATURES = (0ULL << VIRTIO_NET_F_MRG_RXBUF); +/* Features supported by this application. RX merge buffers are enabled by default. */ +#define VHOST_SUPPORTED_FEATURES (1ULL << VIRTIO_NET_F_MRG_RXBUF) +static uint64_t VHOST_FEATURES = VHOST_SUPPORTED_FEATURES; /* Line size for reading maps file. */ const uint32_t BUFSIZE = PATH_MAX; -- 2.20.1