diff --git a/src/sys/kernel/sched.c b/src/sys/kernel/sched.c index 28f8de8..ec55bee 100644 --- a/src/sys/kernel/sched.c +++ b/src/sys/kernel/sched.c @@ -94,15 +94,13 @@ _current = tmpTask; if (_current->state == FORK) _current->state = READY; - if (_current->state == DEAD) - { - sched_deleteTask(_current->id); - sched_addDelTask(_current->id); - continue; - } - break; } + else if (_current->state == DEAD) { + sched_deleteTask(_current->id); + sched_addDelTask(_current->id); + continue; + } } /* Finished all the tasks, restarting the list */ @@ -276,6 +274,9 @@ /*** $Log$ + Revision 1.55 2004/09/11 21:30:37 apwillia + Fix race conditions in net thread and scheduler + Revision 1.54 2004/09/11 17:39:51 apwillia CHRIS: Don't mess with scheduler structures outside the schedulergvim endtask.c Finally fixed the race condition. diff --git a/src/sys/net/net/init.c b/src/sys/net/net/init.c index 0a502f0..7b59ddb 100644 --- a/src/sys/net/net/init.c +++ b/src/sys/net/net/init.c @@ -77,8 +77,8 @@ kprintf("TCP/IP initialized.\n"); - IP4_ADDR(&gw, 10,4,0,1); - IP4_ADDR(&ipaddr, 10,4,0,69); + IP4_ADDR(&gw, 192,168,0,1); + IP4_ADDR(&ipaddr, 192,168,0,58); IP4_ADDR(&netmask, 255,255,255,0); netif_set_default(netif_add(&ipaddr, &netmask, &gw, ethernetif_init, tcpip_input));