diff options
| author | David Gwynne <dlg@cvs.openbsd.org> | 2007-11-12 10:14:41 +0000 |
|---|---|---|
| committer | David Gwynne <dlg@cvs.openbsd.org> | 2007-11-12 10:14:41 +0000 |
| commit | 5e745dc91cb9de34a00ccf48e8fa133f607058f4 (patch) | |
| tree | 9854d8d9947ce6e686f181799a007356660d237d /sbin/dhclient/dispatch.c | |
| parent | 5255ae1c26e23c3f8ae8b78648464ecce45fdac6 (diff) | |
dont spew debug output when the SIOCGIFMEDIA ioctl errors with ENOTTY.
ok krw@ henning@
Diffstat (limited to 'sbin/dhclient/dispatch.c')
| -rw-r--r-- | sbin/dhclient/dispatch.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/sbin/dhclient/dispatch.c b/sbin/dhclient/dispatch.c index 411a1b08c86..f02aabead3c 100644 --- a/sbin/dhclient/dispatch.c +++ b/sbin/dhclient/dispatch.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dispatch.c,v 1.39 2007/02/14 23:15:01 stevesk Exp $ */ +/* $OpenBSD: dispatch.c,v 1.40 2007/11/12 10:14:40 dlg Exp $ */ /* * Copyright 2004 Henning Brauer <henning@openbsd.org> @@ -310,16 +310,13 @@ interface_status(void) memset(&ifmr, 0, sizeof(ifmr)); strlcpy(ifmr.ifm_name, ifname, sizeof(ifmr.ifm_name)); if (ioctl(ifsock, SIOCGIFMEDIA, (caddr_t)&ifmr) < 0) { - if (errno != EINVAL) { - debug("ioctl(SIOCGIFMEDIA) on %s: %m", ifname); - - ifi->noifmedia = 1; - goto active; - } /* - * EINVAL (or ENOTTY) simply means that the interface + * EINVAL or ENOTTY simply means that the interface * does not support the SIOCGIFMEDIA ioctl. We regard it alive. */ + if (errno != EINVAL && errno != ENOTTY) + debug("ioctl(SIOCGIFMEDIA) on %s: %m", ifname); + ifi->noifmedia = 1; goto active; } @@ -436,8 +433,8 @@ interface_link_status(char *ifname) memset(&ifmr, 0, sizeof(ifmr)); strlcpy(ifmr.ifm_name, ifname, sizeof(ifmr.ifm_name)); if (ioctl(sock, SIOCGIFMEDIA, (caddr_t)&ifmr) == -1) { - /* EINVAL -> link state unknown. treat as active */ - if (errno != EINVAL) + /* EINVAL/ENOTTY -> link state unknown. treat as active */ + if (errno != EINVAL && errno != ENOTTY) debug("ioctl(SIOCGIFMEDIA) on %s: %m", ifname); close(sock); return (1); |