From: Johannes Berg Date: Mon, 16 Dec 2013 20:08:25 +0000 (+0100) Subject: wpa_ctrl: Use monotonic time for request retry loop X-Git-Tag: hostap_2_1~440 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=636e19a53dd8457d036899a9df9d84174d10a524;p=thirdparty%2Fhostap.git wpa_ctrl: Use monotonic time for request retry loop The request retry loop only retries for 5 seconds, so any time jumps would probably not affect it much, but it should be using monotonic time nonetheless since it only cares about duration. Signed-hostap: Johannes Berg --- diff --git a/src/common/wpa_ctrl.c b/src/common/wpa_ctrl.c index 83788d7de..f4af94aa1 100644 --- a/src/common/wpa_ctrl.c +++ b/src/common/wpa_ctrl.c @@ -391,7 +391,7 @@ int wpa_ctrl_request(struct wpa_ctrl *ctrl, const char *cmd, size_t cmd_len, void (*msg_cb)(char *msg, size_t len)) { struct timeval tv; - struct os_time started_at; + struct os_reltime started_at; int res; fd_set rfds; const char *_cmd; @@ -430,12 +430,12 @@ retry_send: * longer before giving up. */ if (started_at.sec == 0) - os_get_time(&started_at); + os_get_reltime(&started_at); else { - struct os_time n; - os_get_time(&n); + struct os_reltime n; + os_get_reltime(&n); /* Try for a few seconds. */ - if (n.sec > started_at.sec + 5) + if (os_reltime_expired(&n, &started_at, 5)) goto send_err; } os_sleep(1, 0);