nshlib/nsh_netinit.c:  Move call netlib_icmpv6_autoconfiguration() into nsh_net_bringup() like DHCP
@@ -387,13 +387,7 @@ static void nsh_set_ipaddrs(void)
#endif
#ifdef CONFIG_NET_IPv6
-#ifdef CONFIG_NET_ICMPv6_AUTOCONF
- /* Perform ICMPv6 auto-configuration */
-
- netlib_icmpv6_autoconfiguration(NET_DEVNAME);
-
-#else /* CONFIG_NET_ICMPv6_AUTOCONF */
-
+#ifndef CONFIG_NET_ICMPv6_AUTOCONF
/* Set up our fixed host address */
netlib_set_ipv6addr(NET_DEVNAME,
@@ -447,6 +441,12 @@ static void nsh_net_bringup(void)
nsh_associate(NET_DEVNAME);
#endif
+#ifdef CONFIG_NET_ICMPv6_AUTOCONF
+ /* Perform ICMPv6 auto-configuration */
+
+ netlib_icmpv6_autoconfiguration(NET_DEVNAME);
+#endif
+
#ifdef CONFIG_NSH_DHCPC
/* Get the MAC address of the NIC */
