summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamjan Marion <damarion@cisco.com>2019-11-13 10:12:53 +0100
committerDave Barach <openvpp@barachs.net>2019-11-13 15:26:22 +0000
commit06c194d91b6d2d888ed2b0c5cf0df1cdbc7c53a4 (patch)
treef6985a9c68903a4e5b22a1a23be7a5b7dbbda0ee
parent6545df7913b53d71415c7c9643cb824c2ffbaaa7 (diff)
virtio: feature arc have higher priority than redirect
Type: fix Fixes: 8389fb9 Change-Id: Ie159eb444b28b36a7af86049b80fba4e49be93cb Signed-off-by: Damjan Marion <damarion@cisco.com>
-rw-r--r--MAINTAINERS1
-rw-r--r--src/vnet/devices/virtio/node.c7
2 files changed, 5 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index c59bc6a7f1a..baaa5fc1dc9 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -103,6 +103,7 @@ VNET Native Virtio Drivers
I: virtio
Y: src/vnet/devices/virtio/FEATURE.yaml
M: Mohsin Kazmi <sykazmi@cisco.com>
+M: Damjan Marion <damarion@cisco.com>
F: src/vnet/devices/virtio/
VNET Ethernet
diff --git a/src/vnet/devices/virtio/node.c b/src/vnet/devices/virtio/node.c
index 9711c7a030b..ec28fbb5e08 100644
--- 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);