merge && test for master

This commit is contained in:
Carl-Benedikt Krüger 2011-08-02 15:38:40 +02:00
parent 5e33d9c1a3
commit fbc0978462
2 changed files with 3 additions and 3 deletions

View file

@ -1330,7 +1330,7 @@ int mmnif_open()
}
/* set our network interface to the default interface for lwip*/
// netif_set_default(mmnif_dev);
netif_set_default(mmnif_dev);
/* tell lwip all initialization is done and we want to set it ab*/
netif_set_up(mmnif_dev);

View file

@ -154,8 +154,8 @@ int network_init(void)
#endif
// start echo and ping server
echo_init();
ping_init();
// echo_init();
// ping_init();
#endif
return 0;