diff options
| author | Poul-Henning Kamp <phk@FreeBSD.org> | 1999-04-04 19:56:04 +0000 |
|---|---|---|
| committer | Poul-Henning Kamp <phk@FreeBSD.org> | 1999-04-04 19:56:04 +0000 |
| commit | a508801763cfa037b6f7d34bfa9b79a416d4cfba (patch) | |
| tree | 060c0d71d0feca37645b83186335ea76c78f784a | |
| parent | 07872b08c424d4840eaa03f59df0ac479bd80e99 (diff) | |
| download | src-a508801763cfa037b6f7d34bfa9b79a416d4cfba.tar.gz src-a508801763cfa037b6f7d34bfa9b79a416d4cfba.zip | |
Fix a division which I had made a multiplication.
Fix return value from ntp_adjtime().
Submitted by: jhay
Notes
Notes:
svn path=/head/; revision=45302
| -rw-r--r-- | sys/kern/kern_ntptime.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sys/kern/kern_ntptime.c b/sys/kern/kern_ntptime.c index 12bfbd40ae80..2dea5079d9b0 100644 --- a/sys/kern/kern_ntptime.c +++ b/sys/kern/kern_ntptime.c @@ -287,7 +287,7 @@ ntp_adjtime(struct proc *p, struct ntp_adjtime_args *uap) return (error); s = splclock(); if (modes & MOD_FREQUENCY) { - freq = (ntv.freq * 1000LL) << 16; + freq = (ntv.freq * 1000LL) >> 16; if (freq > MAXFREQ) L_LINT(time_freq, MAXFREQ); else if (freq < -MAXFREQ) @@ -378,8 +378,10 @@ ntp_adjtime(struct proc *p, struct ntp_adjtime_args *uap) time_status & STA_PPSJITTER) || (time_status & STA_PPSFREQ && time_status & (STA_PPSWANDER | STA_PPSERROR))) - return (TIME_ERROR); - return (time_state); + p->p_retval[0] = TIME_ERROR; + else + p->p_retval[0] = time_state; + return (error); } /* |