diff options
| author |   Hongjun Ni <hongjun.ni@intel.com> | 2017-04-17 20:02:05 +0800 |
|---|---|---|
| committer | Hongjun Ni <hongjun.ni@intel.com> | 2017-04-17 20:19:39 +0800 |
| commit | 8aae5e9e4261466fda2ab4d080775e3ef7bb2f8d (patch) | |
| tree | c7126eaa4fa9721ff89d059ecbf28070cf337ba1 | |
| parent | c323cabf23d64b9c55d688bf968194b816e19d67 (diff) | |
Fix gre issue due to gre spit into gre4 and gre6
Change-Id: I474cb29c28206604fb213fe642f247d69ee5dfcb
Signed-off-by: Hongjun Ni <hongjun.ni@intel.com>
| -rw-r--r-- | nsh-plugin/nsh-md2-ioam/nsh_md2_ioam.c | 3 | ||||
| -rw-r--r-- | nsh-plugin/nsh/nsh.c | 10 |
2 files changed, 8 insertions, 5 deletions
diff --git a/nsh-plugin/nsh-md2-ioam/nsh_md2_ioam.c b/nsh-plugin/nsh-md2-ioam/nsh_md2_ioam.c index 8f96759..23278b9 100644 --- a/nsh-plugin/nsh-md2-ioam/nsh_md2_ioam.c +++ b/nsh-plugin/nsh-md2-ioam/nsh_md2_ioam.c @@ -265,8 +265,7 @@ u32 fib_path_get_resolving_interface (fib_node_index_t path_index); fib_table_entry_special_add (outer_fib_index, &tun_dst_pfx, FIB_SOURCE_RR, - FIB_ENTRY_FLAG_NONE, - ADJ_INDEX_INVALID); + FIB_ENTRY_FLAG_NONE); t1->sibling_index = fib_entry_child_add (t1->fib_entry_index, hm->fib_entry_type, t1 - hm->dst_tunnels); diff --git a/nsh-plugin/nsh/nsh.c b/nsh-plugin/nsh/nsh.c index c97856c..19ead91 100644 --- a/nsh-plugin/nsh/nsh.c +++ b/nsh-plugin/nsh/nsh.c @@ -2343,9 +2343,13 @@ clib_error_t *nsh_init (vlib_main_t *vm) vlib_node_add_next (vm, vxlan6_gpe_input_node.index, nsh_proxy_node.index); vlib_node_add_next (vm, vxlan6_gpe_input_node.index, nsh_aware_vnf_proxy_node.index); - vlib_node_add_next (vm, gre_input_node.index, nsh_input_node.index); - vlib_node_add_next (vm, gre_input_node.index, nsh_proxy_node.index); - vlib_node_add_next (vm, gre_input_node.index, nsh_aware_vnf_proxy_node.index); + vlib_node_add_next (vm, gre4_input_node.index, nsh_input_node.index); + vlib_node_add_next (vm, gre4_input_node.index, nsh_proxy_node.index); + vlib_node_add_next (vm, gre4_input_node.index, nsh_aware_vnf_proxy_node.index); + + vlib_node_add_next (vm, gre6_input_node.index, nsh_input_node.index); + vlib_node_add_next (vm, gre6_input_node.index, nsh_proxy_node.index); + vlib_node_add_next (vm, gre6_input_node.index, nsh_aware_vnf_proxy_node.index); /* Add NSH-Proxy support */ vlib_node_add_next (vm, vxlan4_input_node.index, nsh_proxy_node.index); |