From c252bcf9ec32221fa9f95e363acdadd5eed51d8a Mon Sep 17 00:00:00 2001 From: Yuanhan Liu Date: Thu, 10 Mar 2016 12:32:43 +0800 Subject: [PATCH] vhost: remove wrong unlikely prediction in Rx VIRTIO_NET_F_MRG_RXBUF is a default feature supported by vhost. Adding unlikely for VIRTIO_NET_F_MRG_RXBUF detection doesn't make sense to me at all. Signed-off-by: Yuanhan Liu --- lib/librte_vhost/vhost_rxtx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/librte_vhost/vhost_rxtx.c b/lib/librte_vhost/vhost_rxtx.c index c7a34721ec..b0bcd057bc 100644 --- a/lib/librte_vhost/vhost_rxtx.c +++ b/lib/librte_vhost/vhost_rxtx.c @@ -589,7 +589,7 @@ uint16_t rte_vhost_enqueue_burst(struct virtio_net *dev, uint16_t queue_id, struct rte_mbuf **pkts, uint16_t count) { - if (unlikely(dev->features & (1 << VIRTIO_NET_F_MRG_RXBUF))) + if (dev->features & (1 << VIRTIO_NET_F_MRG_RXBUF)) return virtio_dev_merge_rx(dev, queue_id, pkts, count); else return virtio_dev_rx(dev, queue_id, pkts, count); -- 2.20.1