merge && test for master

This commit is contained in:
Carl-Benedikt Krüger 2011-08-02 12:32:41 +02:00
parent 4d5150558a
commit be7a5ff269

View file

@ -150,7 +150,7 @@ int network_init(void)
}
}
#else
//mmnif_open();
mmnif_open();
#endif
// start echo and ping server
@ -164,7 +164,7 @@ int network_init(void)
int network_shutdown(void)
{
#if defined(CONFIG_LWIP) && defined(CONFIG_ROCKCREEK)
//mmnif_close();
mmnif_close();
#elif defined(CONFIG_LWIP) && defined(CONFIG_PCI)
dhcp_release(default_netif);
dhcp_stop(default_netif);