diff options
Diffstat (limited to 'vnet/vnet/devices/dpdk')
-rw-r--r-- | vnet/vnet/devices/dpdk/cli.c | 2 | ||||
-rw-r--r-- | vnet/vnet/devices/dpdk/node.c | 15 |
2 files changed, 4 insertions, 13 deletions
diff --git a/vnet/vnet/devices/dpdk/cli.c b/vnet/vnet/devices/dpdk/cli.c index 2ffb95884d3..9e8fed44efb 100644 --- a/vnet/vnet/devices/dpdk/cli.c +++ b/vnet/vnet/devices/dpdk/cli.c @@ -21,7 +21,7 @@ #include <vnet/ethernet/ethernet.h> #include <vnet/devices/dpdk/dpdk.h> #include <vnet/classify/vnet_classify.h> -#include <vnet/mpls-gre/packet.h> +#include <vnet/mpls/packet.h> #include "dpdk_priv.h" diff --git a/vnet/vnet/devices/dpdk/node.c b/vnet/vnet/devices/dpdk/node.c index a9e286e56eb..63e7e559286 100644 --- a/vnet/vnet/devices/dpdk/node.c +++ b/vnet/vnet/devices/dpdk/node.c @@ -21,7 +21,7 @@ #include <vnet/ethernet/ethernet.h> #include <vnet/devices/dpdk/dpdk.h> #include <vnet/classify/vnet_classify.h> -#include <vnet/mpls-gre/packet.h> +#include <vnet/mpls/packet.h> #include <vnet/handoff.h> #include "dpdk_priv.h" @@ -687,7 +687,7 @@ poll_rate_limit (dpdk_main_t * dm) <em>Next Nodes:</em> - Static arcs to: error-drop, ethernet-input, - ip4-input-no-checksum, ip6-input, mpls-gre-input + ip4-input-no-checksum, ip6-input, mpls-input - per-interface redirection, controlled by <code>xd->per_interface_next_index</code> */ @@ -791,7 +791,7 @@ VLIB_REGISTER_NODE (dpdk_input_node) = { [DPDK_RX_NEXT_ETHERNET_INPUT] = "ethernet-input", [DPDK_RX_NEXT_IP4_INPUT] = "ip4-input-no-checksum", [DPDK_RX_NEXT_IP6_INPUT] = "ip6-input", - [DPDK_RX_NEXT_MPLS_INPUT] = "mpls-gre-input", + [DPDK_RX_NEXT_MPLS_INPUT] = "mpls-input", }, }; @@ -805,7 +805,6 @@ VLIB_NODE_FUNCTION_MULTIARCH_CLONE(dpdk_input_efd) CLIB_MULTIARCH_SELECT_FN(dpdk_input); CLIB_MULTIARCH_SELECT_FN(dpdk_input_rss); CLIB_MULTIARCH_SELECT_FN(dpdk_input_efd); -/* *INDENT-ON* */ /* * Override the next nodes for the dpdk input nodes. @@ -876,11 +875,3 @@ efd_config (u32 enabled, set_efd_bitmap (&tm->efd.mpls_exp_bitmap, mpls_exp, mpls_op); set_efd_bitmap (&tm->efd.vlan_cos_bitmap, vlan_cos, vlan_op); } - -/* - * fd.io coding-style-patch-verification: ON - * - * Local Variables: - * eval: (c-set-style "gnu") - * End: - */ |