summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2013-12-10 16:25:53 +0100
committerThomas Haller <thaller@redhat.com>2014-01-30 19:51:45 +0100
commitfc870cf110e24f5eb97bbc65803558b97d87e2f3 (patch)
tree4afa703d6425355db0ebf1925600189c877c9d32
parentf50ca4aed1fd1c33f9713f55b2e6acc1c45da240 (diff)
downloadNetworkManager-fc870cf110e24f5eb97bbc65803558b97d87e2f3.tar.gz
core: use nm_utils_get_monotonic_timestamp_s in nm-device-wifi (scheduled_scan_time)
https://bugzilla.gnome.org/show_bug.cgi?id=720833 Signed-off-by: Thomas Haller <thaller@redhat.com>
-rw-r--r--src/devices/nm-device-wifi.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/devices/nm-device-wifi.c b/src/devices/nm-device-wifi.c
index 6b47225fb2..2db8b419bd 100644
--- a/src/devices/nm-device-wifi.c
+++ b/src/devices/nm-device-wifi.c
@@ -142,7 +142,7 @@ struct _NMDeviceWifiPrivate {
guint32 rate;
gboolean enabled; /* rfkilled or not */
- time_t scheduled_scan_time;
+ gint32 scheduled_scan_time;
guint8 scan_interval; /* seconds */
guint pending_scan_id;
guint scanlist_cull_id;
@@ -1709,7 +1709,7 @@ static void
schedule_scan (NMDeviceWifi *self, gboolean backoff)
{
NMDeviceWifiPrivate *priv = NM_DEVICE_WIFI_GET_PRIVATE (self);
- time_t now = time (NULL);
+ gint32 now = nm_utils_get_monotonic_timestamp_s ();
/* Cancel the pending scan if it would happen later than (now + the scan_interval) */
if (priv->pending_scan_id) {