From 6f9bc4e4d8a300ef716adcc613e8a82747dcf496 Mon Sep 17 00:00:00 2001 From: Neale Ranns Date: Fri, 20 Jul 2018 04:23:43 -0700 Subject: QOS: mark/record fix feature ordering c-n-p error vnet_feature_arc_init:215: feature node 'mpls-qos-mark' not found (after 'vlan-mpls-qos-record', arc 'mpls-input') vnet_feature_arc_init:215: feature node 'ip6-qos-mark' not found (after 'vlan-ip6-qos-record', arc 'ip6-multicast') ...etc... Change-Id: I22cb98d57e2480f5978fff315b77b9cbb6a9f9dd Signed-off-by: Neale Ranns (cherry picked from commit 8d753f906ecdd152af1e524919e99bd9ab45de46) --- src/vnet/qos/qos_record.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/vnet/qos/qos_record.c b/src/vnet/qos/qos_record.c index 92620458f08..44428a06c3d 100644 --- a/src/vnet/qos/qos_record.c +++ b/src/vnet/qos/qos_record.c @@ -407,7 +407,7 @@ VLIB_NODE_FUNCTION_MULTIARCH (vlan_mpls_qos_record_node, vlan_mpls_qos_record); VNET_FEATURE_INIT (vlan_mpls_qos_record_node, static) = { .arc_name = "mpls-input", .node_name = "vlan-mpls-qos-record", - .runs_before = VNET_FEATURES ("mpls-qos-mark"), + .runs_before = VNET_FEATURES ("mpls-qos-record"), }; VLIB_REGISTER_NODE (vlan_ip4_qos_record_node) = { @@ -430,12 +430,12 @@ VLIB_NODE_FUNCTION_MULTIARCH (vlan_ip4_qos_record_node, vlan_ip4_qos_record); VNET_FEATURE_INIT (vlan_ip4_qos_record_node, static) = { .arc_name = "ip4-unicast", .node_name = "vlan-ip4-qos-record", - .runs_before = VNET_FEATURES ("ip4-qos-mark"), + .runs_before = VNET_FEATURES ("ip4-qos-record"), }; VNET_FEATURE_INIT (vlan_ip4m_qos_record_node, static) = { .arc_name = "ip4-multicast", .node_name = "vlan-ip4-qos-record", - .runs_before = VNET_FEATURES ("ip4-qos-mark"), + .runs_before = VNET_FEATURES ("ip4-qos-record"), }; VLIB_REGISTER_NODE (vlan_ip6_qos_record_node) = { @@ -458,12 +458,12 @@ VLIB_NODE_FUNCTION_MULTIARCH (vlan_ip6_qos_record_node, vlan_ip6_qos_record); VNET_FEATURE_INIT (vlan_ip6_qos_record_node, static) = { .arc_name = "ip6-unicast", .node_name = "vlan-ip6-qos-record", - .runs_before = VNET_FEATURES ("ip6-qos-mark"), + .runs_before = VNET_FEATURES ("ip6-qos-record"), }; VNET_FEATURE_INIT (vlan_ip6m_qos_record_node, static) = { .arc_name = "ip6-multicast", .node_name = "vlan-ip6-qos-record", - .runs_before = VNET_FEATURES ("ip6-qos-mark"), + .runs_before = VNET_FEATURES ("ip6-qos-record"), }; VLIB_REGISTER_NODE (l2_ip_qos_record_node, static) = { -- cgit 1.2.3-korg