diff options
Diffstat (limited to 'cicn-plugin/cicn/cicn.c')
| -rw-r--r-- | cicn-plugin/cicn/cicn.c | 30 |
1 files changed, 9 insertions, 21 deletions
diff --git a/cicn-plugin/cicn/cicn.c b/cicn-plugin/cicn/cicn.c index d44eeb6f..9beea5d5 100644 --- a/cicn-plugin/cicn/cicn.c +++ b/cicn-plugin/cicn/cicn.c @@ -441,30 +441,10 @@ cicn_init (vlib_main_t * vm) { clib_error_t *error = 0; - error = cicn_api_plugin_hookup (vm); - - return error; -} - -VLIB_INIT_FUNCTION (cicn_init); - -/* - * This routine exists to convince the vlib plugin framework that - * we haven't accidentally copied a random .dll into the plugin directory. - * - * Also collects global variable pointers passed from the vpp engine - */ - -clib_error_t * -vlib_plugin_register (vlib_main_t * vm, vnet_plugin_handoff_t * h, - int from_early_init) -{ cicn_main_t *sm = &cicn_main; - clib_error_t *error = 0; sm->vlib_main = vm; - sm->vnet_main = h->vnet_main; - sm->ethernet_main = h->ethernet_main; + sm->vnet_main = vnet_get_main (); /* Init other elements in the 'main' struct */ sm->is_enabled = 0; @@ -476,6 +456,14 @@ vlib_plugin_register (vlib_main_t * vm, vnet_plugin_handoff_t * h, sm->pgen_svr_enabled = 0; + error = cicn_api_plugin_hookup (vm); + return error; } +VLIB_INIT_FUNCTION (cicn_init); + +/* *INDENT-OFF* */ +VLIB_PLUGIN_REGISTER () = { +}; +/* *INDENT-ON* */ |