From c865982df5c2de43a5734a8efbeaab221b0f92f1 Mon Sep 17 00:00:00 2001 From: kkrentz Date: Thu, 15 Oct 2015 00:41:12 -0700 Subject: [PATCH] JN516x: Call LLSEC.init instead of LLSEC.bootstrap --- platform/jn516x/contiki-jn516x-main.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/platform/jn516x/contiki-jn516x-main.c b/platform/jn516x/contiki-jn516x-main.c index 2bf27e64b..deda71b11 100644 --- a/platform/jn516x/contiki-jn516x-main.c +++ b/platform/jn516x/contiki-jn516x-main.c @@ -228,17 +228,6 @@ start_uip6(void) #endif /* NETSTACK_CONF_WITH_IPV6 */ /*---------------------------------------------------------------------------*/ static void -start_network_layer(void) -{ -#if NETSTACK_CONF_WITH_IPV6 - start_uip6(); -#endif /* NETSTACK_CONF_WITH_IPV6 */ - start_autostart_processes(); - /* To support link layer security in combination with NETSTACK_CONF_WITH_IPV4 and - * TIMESYNCH_CONF_ENABLED further things may need to be moved here */ -} -/*--------------------------------------------------------------------------*/ -static void set_linkaddr(void) { int i; @@ -409,7 +398,12 @@ main(void) #endif /* NETSTACK_CONF_WITH_IPV4 */ watchdog_start(); - NETSTACK_LLSEC.bootstrap(start_network_layer); + NETSTACK_LLSEC.init(); + +#if NETSTACK_CONF_WITH_IPV6 + start_uip6(); +#endif /* NETSTACK_CONF_WITH_IPV6 */ + start_autostart_processes(); leds_off(LEDS_ALL); int r;