Add llc_init in osi_init to ensure init order dependency 66/566/2
authorNagaprabhanjan Bellari <nagp.lists@gmail.com>
Fri, 18 Mar 2016 13:40:21 +0000 (19:10 +0530)
committerGerrit Code Review <gerrit@fd.io>
Sat, 19 Mar 2016 12:46:08 +0000 (12:46 +0000)
Change-Id: I5cb2a319384e49a072d75f3ea05e6fb92e381c23
Signed-off-by: Nagaprabhanjan Bellari <nagp.lists@gmail.com>
vnet/vnet/osi/osi.c

index 7313dab..1825af1 100644 (file)
@@ -167,8 +167,15 @@ static void add_protocol (osi_main_t * pm,
 
 static clib_error_t * osi_init (vlib_main_t * vm)
 {
+  clib_error_t * error = 0;
   osi_main_t * pm = &osi_main;
 
+  /* init order dependency: llc_init -> osi_init */
+  if ((error = vlib_call_init_function(vm, llc_init)))
+  {
+         return error;
+  }
+
   memset (pm, 0, sizeof (pm[0]));
   pm->vlib_main = vm;