From: Hongjun Ni <hongjun.ni@intel.com>
Date: Thu, 1 Jun 2017 12:08:52 +0000 (+0800)
Subject: Fix NSH plugin loading issue
X-Git-Tag: v17.07-rc1~3
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=d23511851d5b5893518763bd29ef8c374d9dcd87;p=nsh_sfc.git

Fix NSH plugin loading issue

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

diff --git a/nsh-plugin/nsh/nsh.h b/nsh-plugin/nsh/nsh.h
index 3d48b94..e67e64a 100644
--- a/nsh-plugin/nsh/nsh.h
+++ b/nsh-plugin/nsh/nsh.h
@@ -160,7 +160,7 @@ typedef struct {
 nsh_main_t nsh_main;
 
 extern vlib_node_registration_t nsh_aware_vnf_proxy_node;
-extern vlib_node_registration_t nsh_output_node;
+extern vlib_node_registration_t nsh_eth_output_node;
 
 typedef struct {
    u8 trace_data[256];
diff --git a/nsh-plugin/nsh/nsh_output.c b/nsh-plugin/nsh/nsh_output.c
index 1e1b772..c104ee7 100644
--- a/nsh-plugin/nsh/nsh_output.c
+++ b/nsh-plugin/nsh/nsh_output.c
@@ -71,7 +71,7 @@ nsh_output_inline (vlib_main_t * vm,
   nsh_main_t *nm;
 
   thread_index = vlib_get_thread_index();
-  error_node = vlib_node_get_runtime (vm, nsh_output_node.index);
+  error_node = vlib_node_get_runtime (vm, nsh_eth_output_node.index);
   from = vlib_frame_vector_args (from_frame);
   n_left_from = from_frame->n_vectors;
   next_index = node->cached_next_index;