diff -U 5 -r bsd_tcpip.orig/current/include/sys/mbuf.h bsd_tcpip/current/include/sys/mbuf.h
--- bsd_tcpip.orig/current/include/sys/mbuf.h	Tue Jul  1 13:28:48 2003
+++ bsd_tcpip/current/include/sys/mbuf.h	Mon Mar 29 18:14:33 2004
@@ -629,12 +629,11 @@
 struct	mbuf *m_aux_add2 __P((struct mbuf *, int, int, void *));
 struct	mbuf *m_aux_find2 __P((struct mbuf *, int, int, void *));
 struct	mbuf *m_aux_add __P((struct mbuf *, int, int));
 struct	mbuf *m_aux_find __P((struct mbuf *, int, int));
 void	m_aux_delete __P((struct mbuf *, struct mbuf *));
-extern void *cyg_net_mbuf_alloc(int type, int flags);
-extern void cyg_net_mbuf_free(caddr_t addr, int type);
+extern void *cyg_net_mbuf_alloc(void);
 extern void *cyg_net_cluster_alloc(void );
 #ifdef CYGDBG_NET_SHOW_MBUFS                
 extern void cyg_net_show_mbufs(void);
 #endif
 #endif /* _KERNEL */
diff -U 5 -r bsd_tcpip.orig/current/src/ecos/support.c bsd_tcpip/current/src/ecos/support.c
--- bsd_tcpip.orig/current/src/ecos/support.c	Mon Mar  8 13:05:38 2004
+++ bsd_tcpip/current/src/ecos/support.c	Mon Mar 29 18:14:33 2004
@@ -339,23 +339,18 @@
 }
 
 #endif
 
 void *
-cyg_net_mbuf_alloc(int type, int flags)
+cyg_net_mbuf_alloc(void)
 {
     void *res;    
 
     //diag_printf("%s: ", __func__);
     START_STATS();
     log(LOG_MDEBUG, "Alloc mbuf = ");
-    mbstat.m_mbufs++;
-    if (flags & M_NOWAIT) {
-        res = cyg_mempool_fix_try_alloc(net_mbufs);
-    } else {
-        res = cyg_mempool_fix_alloc(net_mbufs);
-    }
+    res = cyg_mempool_fix_try_alloc(net_mbufs);
     FINISH_STATS(stats_mbuf_alloc);
 #ifdef CYGDBG_NET_SHOW_MBUFS    
     {
         int i;
         for( i = 0; i < (sizeof(mbinfo)/sizeof(mbinfo[0])); i++ )
@@ -372,20 +367,10 @@
     log(LOG_MDEBUG, "%p\n", res);
     //diag_printf("%p\n", res);
     return (res);
 }
 
-void 
-cyg_net_mbuf_free(caddr_t addr, int type)
-{
-    //diag_printf("%s: %p\n", __func__, addr);
-    START_STATS();
-    mbstat.m_mbufs--;
-    cyg_mempool_fix_free(net_mbufs, addr);
-    FINISH_STATS(stats_mbuf_free);
-}
-
 void *
 cyg_net_cluster_alloc(void)
 {
     void *res;
 
diff -U 5 -r bsd_tcpip.orig/current/src/sys/kern/uipc_mbuf.c bsd_tcpip/current/src/sys/kern/uipc_mbuf.c
--- bsd_tcpip.orig/current/src/sys/kern/uipc_mbuf.c	Thu Sep 18 11:59:40 2003
+++ bsd_tcpip/current/src/sys/kern/uipc_mbuf.c	Mon Mar 29 18:14:33 2004
@@ -137,11 +137,11 @@
 {
 	struct mbuf *p;
 	int i;
 
 	for (i = 0; i < nmb; i++) {
-            p = (struct mbuf *)cyg_net_mbuf_alloc(0, how);
+            p = (struct mbuf *)cyg_net_mbuf_alloc( );
             if (p != (struct mbuf *)0) {
 		((struct mbuf *)p)->m_next = mmbfree;
 		mmbfree = (struct mbuf *)p;
                 mbstat.m_mbufs++;
                 mbtypes[MT_FREE]++;