Date: Fri, 7 Aug 2015 21:14:20 +0000 (UTC) From: Ian Lepore <ian@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r286423 - head/sys/kern Message-ID: <201508072114.t77LEKnd049324@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ian Date: Fri Aug 7 21:14:19 2015 New Revision: 286423 URL: https://svnweb.freebsd.org/changeset/base/286423 Log: RFC 2783 requires a status of ETIMEDOUT, not EWOULDBLOCK, on a timeout. Modified: head/sys/kern/kern_tc.c Modified: head/sys/kern/kern_tc.c ============================================================================== --- head/sys/kern/kern_tc.c Fri Aug 7 20:18:55 2015 (r286422) +++ head/sys/kern/kern_tc.c Fri Aug 7 21:14:19 2015 (r286423) @@ -1541,8 +1541,12 @@ pps_fetch(struct pps_fetch_args *fapi, s } else { err = tsleep(pps, PCATCH, "ppsfch", timo); } - if (err == EWOULDBLOCK && fapi->timeout.tv_sec == -1) { - continue; + if (err == EWOULDBLOCK) { + if (fapi->timeout.tv_sec == -1) { + continue; + } else { + return (ETIMEDOUT); + } } else if (err != 0) { return (err); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201508072114.t77LEKnd049324>