From 11fb09e38ffcbadc2629361377413f3ce12ec4da Mon Sep 17 00:00:00 2001
From: Dave Barach <dave@barachs.net>
Date: Thu, 6 Aug 2020 12:10:09 -0400
Subject: misc: harmonize names

Type: fix

Signed-off-by: Dave Barach <dave@barachs.net>
Change-Id: Ibad744788e200ce012ad88ff59c2c34920742454
---
 src/vnet/adj/adj_midchain.c | 2 +-
 src/vnet/adj/adj_nsh.c      | 6 +++---
 src/vnet/adj/adj_nsh.h      | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/vnet/adj')

diff --git a/src/vnet/adj/adj_midchain.c b/src/vnet/adj/adj_midchain.c
index 050c25a9e34..49ac24aa49c 100644
--- a/src/vnet/adj/adj_midchain.c
+++ b/src/vnet/adj/adj_midchain.c
@@ -327,7 +327,7 @@ adj_midchain_get_feature_arc_index_for_link_type (const ip_adjacency_t *adj)
 	}
     case VNET_LINK_NSH:
         {
-          arc = nsh_main_dummy.output_feature_arc_index;
+          arc = nsh_main_placeholder.output_feature_arc_index;
           break;
         }
     case VNET_LINK_ARP:
diff --git a/src/vnet/adj/adj_nsh.c b/src/vnet/adj/adj_nsh.c
index 19851b13b24..00d945729d8 100644
--- a/src/vnet/adj/adj_nsh.c
+++ b/src/vnet/adj/adj_nsh.c
@@ -18,7 +18,7 @@
 #include <vnet/ip/ip.h>
 
 #ifndef CLIB_MARCH_VARIANT
-nsh_main_dummy_t nsh_main_dummy;
+nsh_main_placeholder_t nsh_main_placeholder;
 #endif /* CLIB_MARCH_VARIANT */
 
 /**
@@ -124,7 +124,7 @@ adj_nsh_rewrite_inline (vlib_main_t * vm,
                  * Follow the feature ARC. this will result eventually in
                  * the midchain-tx node
                  */
-                vnet_feature_arc_start (nsh_main_dummy.output_feature_arc_index,
+                vnet_feature_arc_start (nsh_main_placeholder.output_feature_arc_index,
                                         tx_sw_if_index0, &next0, p0);
             }
             else
@@ -195,7 +195,7 @@ VNET_FEATURE_ARC_INIT (nsh_output, static) =
 {
   .arc_name  = "nsh-output",
   .start_nodes = VNET_FEATURES ("adj-nsh-midchain"),
-  .arc_index_ptr = &nsh_main_dummy.output_feature_arc_index,
+  .arc_index_ptr = &nsh_main_placeholder.output_feature_arc_index,
 };
 
 VNET_FEATURE_INIT (nsh_tx_drop, static) =
diff --git a/src/vnet/adj/adj_nsh.h b/src/vnet/adj/adj_nsh.h
index 5501fbb9bdc..eff20699dfc 100644
--- a/src/vnet/adj/adj_nsh.h
+++ b/src/vnet/adj/adj_nsh.h
@@ -21,11 +21,11 @@
 extern vlib_node_registration_t adj_nsh_midchain_node;
 extern vlib_node_registration_t adj_nsh_rewrite_node;
 
-typedef struct _nsh_main_dummy
+typedef struct _nsh_main_placeholder
 {
   u8 output_feature_arc_index;
-} nsh_main_dummy_t;
+} nsh_main_placeholder_t;
 
-extern nsh_main_dummy_t nsh_main_dummy;
+extern nsh_main_placeholder_t nsh_main_placeholder;
 
 #endif
-- 
cgit 1.2.3-korg