VPP-182: IPv4 static ARP entries should not be deleted on interface down

[vpp.git] / vnet / vnet / ethernet / init.c

diff --git a/vnet/vnet/ethernet/init.c b/vnet/vnet/ethernet/init.c
index 4ac14e2..9206524 100644 (file)
--- a/vnet/vnet/ethernet/init.c
+++ b/vnet/vnet/ethernet/init.c
@@ -66,6 +66,13 @@ static clib_error_t * ethernet_init (vlib_main_t * vm)
   ethernet_main_t * em = &ethernet_main;
   clib_error_t * error;
 
+  /* 
+   * Set up the L2 path now, or we'll wipe out the L2 ARP
+   * registration set up by ethernet_arp_init.
+   */
+  if ((error = vlib_call_init_function(vm, l2_init)))
+    return error;
+
   em->vlib_main = vm;
 
   em->type_info_by_name = hash_create_string (0, sizeof (uword));
@@ -79,8 +86,6 @@ static clib_error_t * ethernet_init (vlib_main_t * vm)
     return error;
   if ((error = vlib_call_init_function (vm, ethernet_input_init)))
     return error;
-  if ((error = vlib_call_init_function (vm, ethernet_cli_init)))
-    return error;  
 
   return error;
 }