virtio: feature arc have higher priority than redirect

Type: fix
Fixes: 8389fb9

Change-Id: Ie159eb444b28b36a7af86049b80fba4e49be93cb
Signed-off-by: Damjan Marion <[email protected]>
(cherry picked from commit 06c194d91b6d2d888ed2b0c5cf0df1cdbc7c53a4)

diff --git a/MAINTAINERS b/MAINTAINERS
index 410e876..698e646 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -91,9 +91,10 @@ M:   Mohsin Kazmi <[email protected]>
 F:     src/vnet/devices/tap/
 
 VNET Native Virtio Drivers
-I:      virtio
-M:      Mohsin Kazmi <[email protected]>
-F:      src/vnet/devices/virtio/
+I:     virtio
+M:     Mohsin Kazmi <[email protected]>
+M:     Damjan Marion <[email protected]>
+F:     src/vnet/devices/virtio/
 
 VNET Etherent
 I:     ethernet

diff --git a/src/vnet/devices/virtio/node.c b/src/vnet/devices/virtio/node.c
index 9711c7a..ec28fbb 100644 (file)
--- a/src/vnet/devices/virtio/node.c
+++ b/src/vnet/devices/virtio/node.c
@@ -316,9 +316,10 @@ virtio_device_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
 
          if (PREDICT_FALSE (vif->per_interface_next_index != ~0))
            next0 = vif->per_interface_next_index;
-         else
-           /* redirect if feature path enabled */
-           vnet_feature_start_device_input_x1 (vif->sw_if_index, &next0, b0);
+
+         /* redirect if feature path enabled */
+         vnet_feature_start_device_input_x1 (vif->sw_if_index, &next0, b0);
+
          /* trace */
          VLIB_BUFFER_TRACE_TRAJECTORY_INIT (b0);