colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Doesn't need to be a GTimeVal since the microseconds are never used

Browse Source 
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3358 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams
2008-02-28 22:02:20 +00:00
parent d881a15a22
commit cacef51123
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/nm-device-802-11-wireless.c
View File

@@ -131,7 +131,7 @@ struct _NMDevice80211WirelessPrivate
guint32 rate; guint32 rate;
gboolean scanning; gboolean scanning;
GTimeVal scheduled_scan_time; glong scheduled_scan_time;
guint8 scan_interval; /* seconds */ guint8 scan_interval; /* seconds */
guint pending_scan_id; guint pending_scan_id;
@@ -1514,7 +1514,7 @@ schedule_scan (NMDevice80211Wireless *self)
g_get_current_time (&current_time); g_get_current_time (&current_time);
/* Cancel the pending scan only if it would happen later than what is scheduled right now */ /* Cancel the pending scan only if it would happen later than what is scheduled right now */
if (priv->pending_scan_id && (current_time.tv_sec + priv->scan_interval < priv->scheduled_scan_time.tv_sec)) if (priv->pending_scan_id && (current_time.tv_sec + priv->scan_interval < priv->scheduled_scan_time))
cancel_pending_scan (self); cancel_pending_scan (self);
if (!priv->pending_scan_id) if (!priv->pending_scan_id)
@@ -1522,7 +1522,7 @@ schedule_scan (NMDevice80211Wireless *self)
request_wireless_scan, request_wireless_scan,
self); self);
priv->scheduled_scan_time.tv_sec = current_time.tv_sec + priv->scan_interval; priv->scheduled_scan_time = current_time.tv_sec + priv->scan_interval;
if (priv->scan_interval < SCAN_INTERVAL_MAX) if (priv->scan_interval < SCAN_INTERVAL_MAX)
priv->scan_interval += SCAN_INTERVAL_STEP; priv->scan_interval += SCAN_INTERVAL_STEP;
} }