Commit 2c976390 authored by Dan Williams's avatar Dan Williams
Browse files

2005-03-26 Dan Williams <dcbw@redhat.com>

	* src/NetworkManagerDevice.c
		- (nm_device_wireless_scan): Remove duplicated scanning code


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@513 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
parent 334b5786
2005-03-26 Dan Williams <dcbw@redhat.com>
* src/NetworkManagerDevice.c
- (nm_device_wireless_scan): Remove duplicated scanning code
2005-03-25 Dan Williams <dcbw@redhat.com>
* panel-applet/NMWirelessApplet.c
......
......@@ -3735,23 +3735,6 @@ static gboolean nm_device_wireless_scan (gpointer user_data)
nm_completion_scan_has_results, NULL,
dev, &err, sk, scan_results);
err = iw_scan (sk, (char *)nm_device_get_iface (dev), WIRELESS_EXT, &(scan_results->scan_head));
if ((err == -1) && (errno == ENODATA))
{
/* Card hasn't had time yet to compile full access point list.
* Give it some more time and scan again. If that doesn't work
* give up.
*/
g_usleep ((G_USEC_PER_SEC * nm_device_get_association_pause_value (dev)) / 2);
err = iw_scan (sk, (char *)nm_device_get_iface (dev), WIRELESS_EXT, &(scan_results->scan_head));
if (err == -1)
scan_results->scan_head.result = NULL;
}
else if ((err == -1) && (errno == ETIME))
nm_warning ("The wireless card (%s) requires too much time for scans. "
"Its driver needs to be fixed.", nm_device_get_iface (dev));
nm_device_set_mode (dev, orig_mode);
/* Only set frequency if ad-hoc mode */
if (orig_mode == NETWORK_MODE_ADHOC)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment