merge && test for master

This commit is contained in:
Carl-Benedikt Krüger 2011-08-02 15:49:23 +02:00
parent 46ada07578
commit 863c5bf64d

View file

@ -94,8 +94,6 @@ int network_init(void)
reschedule();
}
mmnif_open();
// Set up the lwIP network interface
// Allocate and configure netif
default_netif = (struct netif *) mem_malloc(sizeof(struct netif));
@ -152,12 +150,12 @@ int network_init(void)
}
}
#else
// mmnif_open();
mmnif_open();
#endif
// start echo and ping server
// echo_init();
// ping_init();
echo_init();
ping_init();
#endif
return 0;