diff options
| author | ian <ian@FreeBSD.org> | 2015-08-07 21:14:19 +0000 |
|---|---|---|
| committer | ian <ian@FreeBSD.org> | 2015-08-07 21:14:19 +0000 |
| commit | cbf6cdcbbb6c0212ee9911bbbe9e87053b54ab9f (patch) | |
| tree | bbc2f2a83d28b793f43cd3629b34367a3faad192 | |
| parent | 4c6e75e399092eee840af6c4753849ead0774993 (diff) | |
| download | FreeBSD-src-cbf6cdcbbb6c0212ee9911bbbe9e87053b54ab9f.zip FreeBSD-src-cbf6cdcbbb6c0212ee9911bbbe9e87053b54ab9f.tar.gz | |
RFC 2783 requires a status of ETIMEDOUT, not EWOULDBLOCK, on a timeout.
| -rw-r--r-- | sys/kern/kern_tc.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sys/kern/kern_tc.c b/sys/kern/kern_tc.c index e997818..922e9bf 100644 --- a/sys/kern/kern_tc.c +++ b/sys/kern/kern_tc.c @@ -1541,8 +1541,12 @@ pps_fetch(struct pps_fetch_args *fapi, struct pps_state *pps) } 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); } |
