oneechanhax/phunix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

INET: fix panic when network drivers are started late (Bug#309, reported by Niek Linnenbank)

Browse Source
This commit is contained in:
David van Moolenbroek 2009-10-01 21:24:12 +00:00
parent 8f9a90192f
commit e913d66749
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
servers/inet/mnx_eth.c
View File

@ -115,8 +115,10 @@ PUBLIC void osdep_eth_init()
* started after INET. So we always end up here. And * started after INET. So we always end up here. And
* the findproc can be removed. * the findproc can be removed.
*/ */
#if 0
printf("eth%d: unable to find task %s: %d\n", printf("eth%d: unable to find task %s: %d\n",
i, ecp->ec_task, r); i, ecp->ec_task, r);
#endif
tasknr= ANY; tasknr= ANY;
} }
@ -242,7 +244,9 @@ acc_t *pack;
eth_issue_send(eth_port); eth_issue_send(eth_port);
} }
#if 0
PRIVATE int notification_count; PRIVATE int notification_count;
#endif
PUBLIC void eth_rec(m) PUBLIC void eth_rec(m)
message *m; message *m;
@ -256,9 +260,11 @@ message *m;
if (m_type == DL_NAME_REPLY) if (m_type == DL_NAME_REPLY)
{ {
drivername= m->m3_ca1; drivername= m->m3_ca1;
#if 0
printf("eth_rec: got name: %s\n", drivername); printf("eth_rec: got name: %s\n", drivername);
notification_count= 0; notification_count= 0;
#endif
/* Re-init ethernet interfaces */ /* Re-init ethernet interfaces */
for (i= 0, ecp= eth_conf, loc_port= eth_port_table; for (i= 0, ecp= eth_conf, loc_port= eth_port_table;
@ -490,12 +496,14 @@ message *m;
int i, r, tasknr; int i, r, tasknr;
tasknr= m->m_source; tasknr= m->m_source;
#if 0
if (notification_count < 100) if (notification_count < 100)
{ {
notification_count++; notification_count++;
printf("eth_check_drivers: got a notification #%d from %d\n", printf("eth_check_drivers: got a notification #%d from %d\n",
notification_count, tasknr); notification_count, tasknr);
} }
#endif
m->m_type= DL_GETNAME; m->m_type= DL_GETNAME;
r= asynsend(tasknr, m); r= asynsend(tasknr, m);
@ -901,9 +909,11 @@ int tasknr;
cp_grant_id_t gid; cp_grant_id_t gid;
message mess; message mess;
printf("eth_restart: restarting eth%d, task %d, port %d\n", if (eth_port->etp_osdep.etp_state != OEPS_INIT) {
eth_port-eth_port_table, tasknr, printf("eth_restart: restarting eth%d, task %d, port %d\n",
eth_port->etp_osdep.etp_port); eth_port-eth_port_table, tasknr,
eth_port->etp_osdep.etp_port);
}
if (eth_port->etp_osdep.etp_task == tasknr) if (eth_port->etp_osdep.etp_task == tasknr)
{ {
@ -915,11 +925,13 @@ int tasknr;
switch(eth_port->etp_osdep.etp_state) switch(eth_port->etp_osdep.etp_state)
{ {
case OEPS_INIT:
case OEPS_CONF_SENT: case OEPS_CONF_SENT:
case OEPS_RECV_SENT: case OEPS_RECV_SENT:
case OEPS_SEND_SENT: case OEPS_SEND_SENT:
/* We can safely ignore the pending CONF, RECV, and SEND /* We can safely ignore the pending CONF, RECV, and SEND
* requests. * requests. If this is the first time that we see this
* driver at all, that's fine too.
*/ */
eth_port->etp_osdep.etp_state= OEPS_IDLE; eth_port->etp_osdep.etp_state= OEPS_IDLE;
break; break;