diff --git a/drivers/net/mmnif.c b/drivers/net/mmnif.c
index 3f3df57b..96632200 100644
--- a/drivers/net/mmnif.c
+++ b/drivers/net/mmnif.c
@@ -761,7 +761,7 @@ err_t mmnif_tx(struct netif* netif, struct pbuf* p)
 	/* get the palce the router core is looking for the packet */
 
 	/* lock the dest_ip mm_rx_buffer_hdr */
-retry:	mmnif_lock_rx_hdr(dest_ip);
+        mmnif_lock_rx_hdr(dest_ip);
 
 	/* read and edit needed values */
 	queued = mmnif_read_rx_queue(dest_ip);
@@ -780,7 +780,7 @@ retry:	mmnif_lock_rx_hdr(dest_ip);
 	if ((queued + pending) > MMNIF_RX_QUEUELEN)
 	{
 		DEBUGPRINTF("mmnif_tx(): too many packet's at once for the remote queue : q:%d p:%d\n",queued , pending);
-                goto retry;
+                goto drop_packet;
 	}
 
 	pos = (pos + queued + pending -1) % MMNIF_RX_QUEUELEN;
@@ -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);
 
@@ -1356,7 +1356,7 @@ int mmnif_open()
 		mmnif_worker_schedule();
 
 
-        mmnif_retrigger_schedule();
+//        mmnif_retrigger_schedule();
 
 #ifdef DEBUG_MMNIF
 	DEBUGPRINTF("mmnif_dev is open\n");
diff --git a/kernel/init.c b/kernel/init.c
index 38da94b8..7475d2c9 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;