diff options
| author | phk <phk@FreeBSD.org> | 1999-04-04 19:56:04 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 1999-04-04 19:56:04 +0000 |
| commit | 95a470c499918a30df1311cc8ed59f2fc0245ee3 (patch) | |
| tree | dc3034179131b00cdfb16ba332d1905371aa35f4 /sys/kern/kern_ntptime.c | |
| parent | dd605303bbfe18655afb5bfc074580c1988cf7df (diff) | |
| download | FreeBSD-src-95a470c499918a30df1311cc8ed59f2fc0245ee3.zip FreeBSD-src-95a470c499918a30df1311cc8ed59f2fc0245ee3.tar.gz | |
Fix a division which I had made a multiplication.
Fix return value from ntp_adjtime().
Submitted by: jhay
Diffstat (limited to 'sys/kern/kern_ntptime.c')
| -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 12bfbd4..2dea507 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); } /* |
