merge && test for master

This commit is contained in:
Carl-Benedikt Krüger 2011-08-02 15:43:22 +02:00
parent a4d5d661d4
commit 46ada07578

View file

@ -94,6 +94,8 @@ 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));
@ -150,7 +152,7 @@ int network_init(void)
}
}
#else
mmnif_open();
// mmnif_open();
#endif
// start echo and ping server