diff options
| author |   Damjan Marion <damarion@cisco.com> | 2019-11-13 10:12:53 +0100 |
|---|---|---|
| committer |   Andrew Yourtchenko <ayourtch@gmail.com> | 2020-02-06 12:19:28 +0000 |
| commit | 2e05c214a50dcb38e9c5f79f80a2102b847cbafc (patch) | |
| tree | 7d84f842a6da9cc63d4bb0992bb2a28dd3d36891 | |
| parent | 04b4204d9c58c2a68f0d3993e7b73c9040907846 (diff) | |
virtio: feature arc have higher priority than redirect
Type: fix
Fixes: 8389fb9
Change-Id: Ie159eb444b28b36a7af86049b80fba4e49be93cb
Signed-off-by: Damjan Marion <damarion@cisco.com>
(cherry picked from commit 06c194d91b6d2d888ed2b0c5cf0df1cdbc7c53a4)
| -rw-r--r-- | MAINTAINERS | 7 | ||||
| -rw-r--r-- | src/vnet/devices/virtio/node.c | 7 |
2 files changed, 8 insertions, 6 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 410e876b319..698e646096d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -91,9 +91,10 @@ M: Mohsin Kazmi <sykazmi@cisco.com> F: src/vnet/devices/tap/ VNET Native Virtio Drivers -I: virtio -M: Mohsin Kazmi <sykazmi@cisco.com> -F: src/vnet/devices/virtio/ +I: virtio +M: Mohsin Kazmi <sykazmi@cisco.com> +M: Damjan Marion <damarion@cisco.com> +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 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); |