lb: add APIs for set interface nat4 and nat6

[vpp.git] / src / vlib / linux / pci.c

diff --git a/src/vlib/linux/pci.c b/src/vlib/linux/pci.c
index 8b614c7..fdb5271 100644 (file)
--- a/src/vlib/linux/pci.c
+++ b/src/vlib/linux/pci.c
@@ -1247,9 +1247,9 @@ vlib_pci_device_open (vlib_main_t * vm, vlib_pci_addr_t * addr,
                 di->vendor_id, di->device_id, di->driver_name,
                 di->iommu_group);
 
-  if (strncmp ("vfio-pci", (char *) di->driver_name, 8) == 0)
+  if (clib_strncmp ("vfio-pci", (char *) di->driver_name, 8) == 0)
     err = add_device_vfio (vm, p, di, 0);
-  else if (strncmp ("uio_pci_generic", (char *) di->driver_name, 8) == 0)
+  else if (clib_strncmp ("uio_pci_generic", (char *) di->driver_name, 8) == 0)
     err = add_device_uio (vm, p, di, 0);
   else
     err = clib_error_create ("device not bound to 'vfio-pci' or "
@@ -1449,13 +1449,9 @@ linux_pci_init (vlib_main_t * vm)
 {
   vlib_pci_main_t *pm = &pci_main;
   vlib_pci_addr_t *addr = 0, *addrs;
-  clib_error_t *error;
 
   pm->vlib_main = vm;
 
-  if ((error = vlib_call_init_function (vm, unix_input_init)))
-    return error;
-
   ASSERT (sizeof (vlib_pci_addr_t) == sizeof (u32));
 
   addrs = vlib_pci_get_all_dev_addrs ();
@@ -1471,10 +1467,15 @@ linux_pci_init (vlib_main_t * vm)
     }
   /* *INDENT-ON* */
 
-  return error;
+  return 0;
 }
 
-VLIB_INIT_FUNCTION (linux_pci_init);
+/* *INDENT-OFF* */
+VLIB_INIT_FUNCTION (linux_pci_init) =
+{
+  .runs_after = VLIB_INITS("unix_input_init"),
+};
+/* *INDENT-ON* */
 
 /*
  * fd.io coding-style-patch-verification: ON