From fbc09784622aeb98ad029fabe96edf071f0f3b94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carl-Benedikt=20Kr=C3=BCger?=
 <benedikt.krueger@rwth-aachen.de>
Date: Tue, 2 Aug 2011 15:38:40 +0200
Subject: [PATCH] merge  && test for master

---
 drivers/net/mmnif.c | 2 +-
 kernel/init.c       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/net/mmnif.c b/drivers/net/mmnif.c
index 96632200..b7b43231 100644
--- a/drivers/net/mmnif.c
+++ b/drivers/net/mmnif.c
@@ -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);
 
diff --git a/kernel/init.c b/kernel/init.c
index 7475d2c9..7b987d4a 100644
--- a/kernel/init.c
+++ b/kernel/init.c
@@ -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;