From: Nagaprabhanjan Bellari <nagp.lists@gmail.com>
Date: Fri, 18 Mar 2016 13:40:21 +0000 (+0530)
Subject: Add llc_init in osi_init to ensure init order dependency
X-Git-Tag: odp_vpp~2080
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=a0005dc34718d4c4a904aacadcba745ae3e0fb0e;p=odp4vpp.git

Add llc_init in osi_init to ensure init order dependency

Change-Id: I5cb2a319384e49a072d75f3ea05e6fb92e381c23
Signed-off-by: Nagaprabhanjan Bellari <nagp.lists@gmail.com>
---

diff --git a/vnet/vnet/osi/osi.c b/vnet/vnet/osi/osi.c
index 7313dab1..1825af1f 100644
--- a/vnet/vnet/osi/osi.c
+++ b/vnet/vnet/osi/osi.c
@@ -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;