From: Hongjun Ni <hongjun.ni@intel.com>
Date: Mon, 17 Apr 2017 12:02:05 +0000 (+0800)
Subject: Fix gre issue due to gre spit into gre4 and gre6
X-Git-Tag: v17.07-rc1~8
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=8aae5e9e4261466fda2ab4d080775e3ef7bb2f8d;p=nsh_sfc.git

Fix gre issue due to gre spit into gre4 and gre6

Change-Id: I474cb29c28206604fb213fe642f247d69ee5dfcb
Signed-off-by: Hongjun Ni <hongjun.ni@intel.com>
---

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);