stv0g/metalsvm
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

merge && test for master

Browse source
This commit is contained in:
Carl-Benedikt Krüger 2011-08-02 13:20:06 +02:00
parent c8badae6ad
commit 3936fa5a26
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/net/mmnif.c
View file

@ -849,7 +849,7 @@ drop_packet_fast:
mmnif->stats.tx_err++;
return ERR_OK;
return ERR_IF;
}
/* mmnif_link_layer(): wrapper function called by ip_output()

3
kernel/tests.c
View file

@ -132,6 +132,7 @@ static int join_test(void* arg)
#if defined(CONFIG_LWIP) && defined(CONFIG_ROCKCREEK)
static int srv_cnt = 0;
static Server srv;
void srv_on_read(ServerEventArgs* e)
{
// kprintf("%i:",srv_cnt);
@ -180,7 +181,7 @@ void srv_on_conn(ServerEventArgs* e)
void* server_task(void* e)
{
Server srv;
server_init(&srv,5555,2);
kprintf("created server\n");