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

Clear NONBLOCK flag after probing ethernet device.

Browse Source
This commit is contained in:
Philip Homburg 2006-07-14 13:35:21 +00:00
parent ee46e92dd2
commit 371ac29c9f
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
commands/dhcpd/devices.c
View File

@ -173,12 +173,14 @@ int opendev(network_t *np, fdtype_t fdtype, int compete)
switch (fdtype) { switch (fdtype) {
case FT_ETHERNET: case FT_ETHERNET:
/* Set NONBLOCK to avoid waiting for a device driver to become ready */
fcntl(np->fdp->fd, F_SETFL, fcntl(np->fdp->fd, F_GETFL) | O_NONBLOCK); fcntl(np->fdp->fd, F_SETFL, fcntl(np->fdp->fd, F_GETFL) | O_NONBLOCK);
if (ioctl(np->fdp->fd, NWIOGETHSTAT, &ethstat) < 0) { if (ioctl(np->fdp->fd, NWIOGETHSTAT, &ethstat) < 0) {
/* Not an Ethernet. */ /* Not an Ethernet. */
close(fdp->fd); close(fdp->fd);
return 0; return 0;
} }
fcntl(np->fdp->fd, F_SETFL, fcntl(np->fdp->fd, F_GETFL) & ~O_NONBLOCK);
np->eth= ethstat.nwes_addr; np->eth= ethstat.nwes_addr;
ethopt.nweo_flags= NWEO_COPY | NWEO_EN_LOC | NWEO_EN_BROAD ethopt.nweo_flags= NWEO_COPY | NWEO_EN_LOC | NWEO_EN_BROAD
| NWEO_REMANY | NWEO_TYPEANY | NWEO_RWDATALL; | NWEO_REMANY | NWEO_TYPEANY | NWEO_RWDATALL;