From 2d34553c2cc7d6df2ba8a923fe62049b2328d73c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carl-Benedikt=20Kr=C3=BCger?= Date: Tue, 2 Aug 2011 14:53:41 +0200 Subject: [PATCH] merge && test for master --- drivers/net/mmnif.c | 3 ++- kernel/tests.c | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/net/mmnif.c b/drivers/net/mmnif.c index 4e0d4b8a..907b4768 100644 --- a/drivers/net/mmnif.c +++ b/drivers/net/mmnif.c @@ -771,7 +771,8 @@ retry: mmnif_lock_rx_hdr(dest_ip); pending++; mmnif_write_rx_pending(dest_ip,pending); - /* and unlock the dest_ip mm_rx_buffer_hdr */ + /* and unlock the dest_ip mm_rx_buffer_hdr */ + mmnif_unlock_rx_hdr(dest_ip); /* check if there is a space in the queue without overwriting another packet */ diff --git a/kernel/tests.c b/kernel/tests.c index 1f3f9d45..c066629f 100644 --- a/kernel/tests.c +++ b/kernel/tests.c @@ -177,7 +177,7 @@ void srv_on_conn(ServerEventArgs* e) kprintf("send with %f kb/s", ((float)i*sizeof(buff))/(tmp2-tmp1)); } -#define SHELLDEBUGPRINTF(x,...) kprintf(x,##__VA_ARGS__); +//#define SHELLDEBUGPRINTF(x,...) kprintf(x,##__VA_ARGS__); void* server_task(void* e) { @@ -411,7 +411,7 @@ int test_init(void) sleep(10); SHELLDEBUGPRINTF("hello World! I AM CORE NO. %d =) \n",RCCE_ue()); - if (RCCE_ue()) + if (!RCCE_ue()) create_kernel_task(NULL,server_task,NULL); else create_kernel_task(NULL,client_task,NULL);