svn commit: r286423 - head/sys/kern

[Ian Lepore]

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);
 			}