chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
761a7c7
)
timedatectl: clear ADJ_MAXERROR to make sure we keep STA_SYNC set
author
Kay Sievers
<kay@vrfy.org>
Tue, 18 Mar 2014 02:57:35 +0000
(
03:57
+0100)
committer
Kay Sievers
<kay@vrfy.org>
Tue, 18 Mar 2014 02:57:35 +0000
(
03:57
+0100)
src/timedate/timedate-sntp.c
patch
|
blob
|
history
diff --git
a/src/timedate/timedate-sntp.c
b/src/timedate/timedate-sntp.c
index 36b2a1a1a5627c57151cc8cc5007f38d6f491009..e4aad36cc5499f42e410bbe0a59a227bf972f8c8 100644
(file)
--- a/
src/timedate/timedate-sntp.c
+++ b/
src/timedate/timedate-sntp.c
@@
-347,14
+347,12
@@
static int sntp_adjust_clock(SNTPContext *sntp, double offset, int leap_sec) {
* syncs the system time periodically to the hardware clock.
*/
if (offset < NTP_MAX_ADJUST && offset > -NTP_MAX_ADJUST) {
* syncs the system time periodically to the hardware clock.
*/
if (offset < NTP_MAX_ADJUST && offset > -NTP_MAX_ADJUST) {
- int constant;
-
- constant = log2i(sntp->poll_interval_usec / USEC_PER_SEC) - 6;
-
- tmx.modes |= ADJ_STATUS | ADJ_OFFSET | ADJ_TIMECONST;
+ tmx.modes |= ADJ_STATUS | ADJ_OFFSET | ADJ_TIMECONST | ADJ_MAXERROR | ADJ_ESTERROR;
tmx.status = STA_PLL;
tmx.offset = offset * 1000 * 1000;
tmx.status = STA_PLL;
tmx.offset = offset * 1000 * 1000;
- tmx.constant = constant;
+ tmx.constant = log2i(sntp->poll_interval_usec / USEC_PER_SEC) - 6;
+ tmx.maxerror = 0;
+ tmx.esterror = 0;
log_debug(" adjust (slew): %+f sec\n", (double)tmx.offset / USEC_PER_SEC);
} else {
tmx.modes = ADJ_SETOFFSET;
log_debug(" adjust (slew): %+f sec\n", (double)tmx.offset / USEC_PER_SEC);
} else {
tmx.modes = ADJ_SETOFFSET;