ethernet: fix ARP feature arc definition 19/21019/3
authorDave Barach <dave@barachs.net>
Thu, 1 Aug 2019 20:08:13 +0000 (16:08 -0400)
committerAndrew Yourtchenko <ayourtch@gmail.com>
Fri, 2 Aug 2019 14:14:03 +0000 (14:14 +0000)
This patch gets rid of an ugly warning during vpp startup:

"vnet_feature_init:143: WARNING: arp arc: last node is arp-disabled,
but expected error-drop!"

Type: fix
Fixes: 1ff56f00ca015e82ef29955986e503913d1c3b86

Signed-off-by: Dave Barach <dave@barachs.net>
Change-Id: I80914a3c113c090a09bd5a5131e39f036871d92e

src/vnet/ethernet/arp.c

index 86ad9f3..a42cfda 100644 (file)
@@ -1711,7 +1711,7 @@ VNET_FEATURE_ARC_INIT (arp_feat, static) =
 {
   .arc_name = "arp",
   .start_nodes = VNET_FEATURES ("arp-input"),
-  .last_in_arc = "error-drop",
+  .last_in_arc = "arp-disabled",
   .arc_index_ptr = &ethernet_arp_main.feature_arc_index,
 };
 
@@ -1730,10 +1730,17 @@ VNET_FEATURE_INIT (arp_proxy_feat_node, static) =
   .runs_before = VNET_FEATURES ("arp-disabled"),
 };
 
-VNET_FEATURE_INIT (arp_drop_feat_node, static) =
+VNET_FEATURE_INIT (arp_disabled_feat_node, static) =
 {
   .arc_name = "arp",
   .node_name = "arp-disabled",
+  .runs_before = VNET_FEATURES ("error-drop"),
+};
+
+VNET_FEATURE_INIT (arp_drop_feat_node, static) =
+{
+  .arc_name = "arp",
+  .node_name = "error-drop",
   .runs_before = 0,    /* last feature */
 };