diff options
| author | ian <ian@FreeBSD.org> | 2015-08-23 16:22:21 +0000 |
|---|---|---|
| committer | ian <ian@FreeBSD.org> | 2015-08-23 16:22:21 +0000 |
| commit | 50ce2fd7fcc4d5ce45d566f92ae3fb982d519ddb (patch) | |
| tree | a7369f7a611fcabc4030618a418e7f35fde1df5c /sys/kern/kern_tc.c | |
| parent | 341404d849b10e3bbdf570230b41a2d920e27587 (diff) | |
| download | FreeBSD-src-50ce2fd7fcc4d5ce45d566f92ae3fb982d519ddb.zip FreeBSD-src-50ce2fd7fcc4d5ce45d566f92ae3fb982d519ddb.tar.gz | |
MFC r286423, r286429:
RFC 2783 requires a status of ETIMEDOUT, not EWOULDBLOCK, on a timeout.
Only process the PPS event types currently enabled in pps_params.mode.
Diffstat (limited to 'sys/kern/kern_tc.c')
| -rw-r--r-- | sys/kern/kern_tc.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/sys/kern/kern_tc.c b/sys/kern/kern_tc.c index acb0fbf..0d4ffa2 100644 --- a/sys/kern/kern_tc.c +++ b/sys/kern/kern_tc.c @@ -1511,8 +1511,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); } @@ -1668,6 +1672,9 @@ pps_event(struct pps_state *pps, int event) #endif KASSERT(pps != NULL, ("NULL pps pointer in pps_event")); + /* Nothing to do if not currently set to capture this event type. */ + if ((event & pps->ppsparam.mode) == 0) + return; /* If the timecounter was wound up underneath us, bail out. */ if (pps->capgen == 0 || pps->capgen != pps->capth->th_generation) return; |
