ntpd: don't wait for good offset before disabling burst mode

The burst mode needs to be stopped even when no replies are received.

Signed-off-by: Miroslav Lichvar <mlichvar@redhat.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

diff --git a/networking/ntpd.c b/networking/ntpd.c
index cfe6956312114453674aeecfa21e980159d79c49..3c708c1c560e9ac0bb41e3a92af89dd7f56bfe60 100644 (file)
--- a/networking/ntpd.c
+++ b/networking/ntpd.c
@@ -1472,12 +1472,6 @@ update_local_clock(peer_t *p)
 
        } else { /* abs_offset <= STEP_THRESHOLD */
 
-               if (G.poll_exp < MINPOLL && G.initial_poll_complete) {
-                       VERB4 bb_error_msg("small offset:%+f, disabling burst mode", offset);
-                       G.polladj_count = 0;
-                       G.poll_exp = MINPOLL;
-               }
-
                /* Compute the clock jitter as the RMS of exponentially
                 * weighted offset differences. Used by the poll adjust code.
                 */
@@ -2242,6 +2236,9 @@ int ntpd_main(int argc UNUSED_PARAM, char **argv)
                                if (p->p_fd == -1) {
                                        /* Time to send new req */
                                        if (--cnt == 0) {
+                                               VERB4 bb_error_msg("disabling burst mode");
+                                               G.polladj_count = 0;
+                                               G.poll_exp = MINPOLL;
                                                G.initial_poll_complete = 1;
                                        }
                                        send_query_to_peer(p);