technology: return already enabled when tethering is enabled

[framework/connectivity/connman.git] / src / ntp.c

diff --git a/src/ntp.c b/src/ntp.c
index cbe5a3b..91a8832 100644 (file)
--- a/src/ntp.c
+++ b/src/ntp.c
@@ -2,7 +2,7 @@
  *
  *  Connection Manager
  *
- *  Copyright (C) 2007-2010  Intel Corporation. All rights reserved.
+ *  Copyright (C) 2007-2012  Intel Corporation. All rights reserved.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2 as
@@ -196,6 +196,8 @@ static void decode_msg(void *base, size_t len, struct timeval *tv)
 
        poll_id = g_timeout_add_seconds(transmit_delay, next_poll, NULL);
 
+       connman_info("ntp: time slew %+.6f s", offset);
+
        if (offset < STEPTIME_MIN_OFFSET && offset > -STEPTIME_MIN_OFFSET) {
                struct timeval adj;
 
@@ -359,11 +361,11 @@ int __connman_ntp_start(char *server)
        start_ntp(timeserver);
 
        /*
-        * Add a fallback timeout , preferably longer, 16 sec here,
+        * Add a fallback timeout , preferably short, 5 sec here,
         * to fallback on the next server.
         */
 
-       timeout_id = g_timeout_add_seconds(16, next_server, NULL);
+       timeout_id = g_timeout_add_seconds(5, next_server, NULL);
 
        return 0;
 }