Commit 80991593 authored by Dan Williams's avatar Dan Williams
Browse files

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

	Patch from Tom Parker:
	* src/nm-netlink-monitor.c
		- Include unistd.h
	* info-daemon/NetworkManagerInfoDbus.c
		- (nmi_dbus_update_network_auth_method): free GConf values

	Patch from Nathaniel McCallum <npmccallum@gentoo.org>:
	* src/NetworkManagerDevice.c
		- (nm_device_set_wireless_config): wait for successful
			association longer for some cards (Atheros a/b/g)


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@502 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
parent 11695a7c
2005-03-17 Dan Williams <dcbw@redhat.com>
Patch from Tom Parker:
* src/nm-netlink-monitor.c
- Include unistd.h
* info-daemon/NetworkManagerInfoDbus.c
- (nmi_dbus_update_network_auth_method): free GConf values
Patch from Nathaniel McCallum <npmccallum@gentoo.org>:
* src/NetworkManagerDevice.c
- (nm_device_set_wireless_config): wait for successful
association longer for some cards (Atheros a/b/g)
2005-03-15 Ray Strode <rstrode@redhat.com>
* src/NetworkManager.c:
......
......@@ -540,6 +540,8 @@ static DBusMessage *nmi_dbus_update_network_auth_method (NMIAppInfo *info, DBusM
gconf_client_set_int (info->gconf_client, key, auth_method, NULL);
g_free (key);
}
if (value)
gconf_value_free (value);
g_free (escaped_network);
......
......@@ -1883,7 +1883,7 @@ static gboolean nm_device_set_wireless_config (NMDevice *dev, NMAccessPoint *ap)
((auth == NM_DEVICE_AUTH_METHOD_SHARED_KEY) ? "Shared Key" : "unknown")));
/* Bring the device up and pause to allow card to associate. */
g_usleep (G_USEC_PER_SEC * 2);
g_usleep (G_USEC_PER_SEC * nm_device_get_association_pause_value (dev));
/* Some cards don't really work well in ad-hoc mode unless you explicitly set the bitrate
* on them. (Netgear WG511T/Atheros 5212 with madwifi drivers). Until we can get rate information
......
......@@ -32,6 +32,7 @@
#include <linux/rtnetlink.h>
#include <linux/if.h>
#include <linux/unistd.h>
#include <unistd.h>
#include <glib.h>
#include <glib/gi18n.h>
......
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