3 files changed, 10 insertions, 10 deletions
diff --git a/src/vnet/l2tp/decap.c b/src/vnet/l2tp/decap.c
index 5fc25f55226..787cc115a7e 100644
--- a/src/vnet/l2tp/decap.c
+++ b/src/vnet/l2tp/decap.c
@@ -292,14 +292,6 @@ VLIB_REGISTER_NODE (l2t_decap_local_node) = {
 };
 /* *INDENT-ON* */
 
-#ifndef CLIB_MARCH_VARIANT
-void
-l2tp_decap_init (void)
-{
-  ip6_register_protocol (IP_PROTOCOL_L2TP, l2t_decap_local_node.index);
-}
-#endif /* CLIB_MARCH_VARIANT */
-
 /*
  * fd.io coding-style-patch-verification: ON
  *
diff --git a/src/vnet/l2tp/l2tp.c b/src/vnet/l2tp/l2tp.c
index 6758db39c17..42ecfa619a5 100644
--- a/src/vnet/l2tp/l2tp.c
+++ b/src/vnet/l2tp/l2tp.c
@@ -399,6 +399,12 @@ create_l2tpv3_ipv6_tunnel (l2t_main_t * lm,
   if (sw_if_index)
     *sw_if_index = hi->sw_if_index;
 
+  if (!lm->proto_registered)
+    {
+      ip6_register_protocol (IP_PROTOCOL_L2TP, l2t_decap_local_node.index);
+      lm->proto_registered = true;
+    }
+
   return 0;
 }
 
@@ -729,9 +735,10 @@ l2tp_init (vlib_main_t * vm)
   pi = ip_get_protocol_info (im, IP_PROTOCOL_L2TP);
   pi->unformat_pg_edit = unformat_pg_l2tp_header;
 
+  lm->proto_registered = false;
+
   /* insure these nodes are included in build */
   l2tp_encap_init (vm);
-  l2tp_decap_init ();
 
   return 0;
 }
diff --git a/src/vnet/l2tp/l2tp.h b/src/vnet/l2tp/l2tp.h
index a91f00c282a..49873380057 100644
--- a/src/vnet/l2tp/l2tp.h
+++ b/src/vnet/l2tp/l2tp.h
@@ -80,6 +80,8 @@ typedef struct
   vlib_main_t *vlib_main;
   vnet_main_t *vnet_main;
 
+  bool proto_registered;
+
 } l2t_main_t;
 
 /* Packet trace structure */
@@ -118,7 +120,6 @@ typedef struct
 uword unformat_pg_l2tp_header (unformat_input_t * input, va_list * args);
 
 void l2tp_encap_init (vlib_main_t * vm);
-void l2tp_decap_init (void);
 int create_l2tpv3_ipv6_tunnel (l2t_main_t * lm,
 			       ip6_address_t * client_address,
 			       ip6_address_t * our_address,