fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-02-23 09:40:38 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
* 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
This commit is contained in:
Dan Williams 2005-03-27 01:04:48 +00:00
parent 334b578673
commit 2c976390c5
2 changed files with 5 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
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

17
src/NetworkManagerDevice.c
View file

@ -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)