From: Damjan Marion <damarion@cisco.com>
Date: Thu, 5 May 2016 20:49:38 +0000 (+0200)
Subject: Fix vpp_lite build caused by missing definition of unlikely macro
X-Git-Tag: v16.06-rc1~43
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=4e0fcd7932c9032f9de24379ec968fc3611421cb;p=vpp.git

Fix vpp_lite build caused by missing definition of unlikely macro

Change-Id: I11b34e171c1c7907dd3faec219866418b4e792f6
Signed-off-by: Damjan Marion <damarion@cisco.com>
---

diff --git a/vnet/vnet/devices/netmap/netmap.h b/vnet/vnet/devices/netmap/netmap.h
index 15b14dbb0b7..026f0001f96 100644
--- a/vnet/vnet/devices/netmap/netmap.h
+++ b/vnet/vnet/devices/netmap/netmap.h
@@ -122,7 +122,7 @@ int netmap_delete_if(vlib_main_t * vm, u8 * host_if_name);
 static inline uint32_t
 nm_ring_next(struct netmap_ring *ring, uint32_t i)
 {
-        return ( unlikely(i + 1 == ring->num_slots) ? 0 : i + 1);
+        return ( PREDICT_FALSE(i + 1 == ring->num_slots) ? 0 : i + 1);
 }