X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fip%2Fip6_punt_drop.c;h=b8944891cf9fbbb1a258e747529a7e209fdf22fd;hb=8269d3dbe70adaae60806d5d84e35f25d23193c5;hp=88527756966ccf79240621c97dd43018a26082e1;hpb=f2a23cc8602525a325eaeaae6aca5e18882c33da;p=vpp.git

diff --git a/src/vnet/ip/ip6_punt_drop.c b/src/vnet/ip/ip6_punt_drop.c
index 88527756966..b8944891cf9 100644
--- a/src/vnet/ip/ip6_punt_drop.c
+++ b/src/vnet/ip/ip6_punt_drop.c
@@ -28,7 +28,7 @@ VNET_FEATURE_ARC_INIT (ip6_punt) =
 VNET_FEATURE_ARC_INIT (ip6_drop) =
 {
   .arc_name  = "ip6-drop",
-  .start_nodes = VNET_FEATURES ("ip6-drop"),
+  .start_nodes = VNET_FEATURES ("ip6-drop", "ip6-not-enabled"),
 };
 /* *INDENT-ON* */
 
@@ -88,6 +88,18 @@ ip6_drop (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame)
 
 }
 
+static uword
+ip6_not_enabled (vlib_main_t * vm,
+		 vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  if (node->flags & VLIB_NODE_FLAG_TRACE)
+    ip6_forward_next_trace (vm, node, frame, VLIB_TX);
+
+  return ip_drop_or_punt (vm, node, frame,
+			  vnet_feat_arc_ip6_drop.feature_arc_index);
+
+}
+
 static uword
 ip6_punt (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame)
 {
@@ -113,6 +125,20 @@ VLIB_REGISTER_NODE (ip6_drop_node, static) =
 
 VLIB_NODE_FUNCTION_MULTIARCH (ip6_drop_node, ip6_drop);
 
+VLIB_REGISTER_NODE (ip6_not_enabled_node, static) =
+{
+  .function = ip6_not_enabled,
+  .name = "ip6-not-enabled",
+  .vector_size = sizeof (u32),
+  .format_trace = format_ip6_forward_next_trace,
+  .n_next_nodes = 1,
+  .next_nodes = {
+    [0] = "error-drop",
+  },
+};
+
+VLIB_NODE_FUNCTION_MULTIARCH (ip6_not_enabled_node, ip6_not_enabled);
+
 VLIB_REGISTER_NODE (ip6_punt_node, static) =
 {
   .function = ip6_punt,