From: Damjan Marion <damarion@cisco.com>
Date: Mon, 14 Dec 2015 22:00:17 +0000 (+0100)
Subject: Fix vhost-user input interface handling
X-Git-Tag: v16.06-rc1~446
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F53%2F53%2F1;p=vpp.git

Fix vhost-user input interface handling

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

diff --git a/vnet/vnet/devices/virtio/vhost-user.c b/vnet/vnet/devices/virtio/vhost-user.c
index 4df025c21b6..20a4c021c6a 100644
--- a/vnet/vnet/devices/virtio/vhost-user.c
+++ b/vnet/vnet/devices/virtio/vhost-user.c
@@ -987,11 +987,9 @@ vhost_user_input (vlib_main_t * vm,
   for(i = 0; i < vec_len(vum->vhost_user_interfaces); i++ )
     {
       vui = vec_elt_at_index(vum->vhost_user_interfaces, i);
-      if (!vui->is_up ||
+      if (vui->is_up &&
           (i % dm->input_cpu_count) == (cpu_index - dm->input_cpu_first_index))
-        continue;
-      n_rx_packets +=
-        vhost_user_if_input (vm, vum, vui, node);
+        n_rx_packets += vhost_user_if_input (vm, vum, vui, node);
     }
   return n_rx_packets;
 }