2005-12-08 Robert Love <rml@novell.com>

* src/NetworkManagerDevice.c: We want to fall back on and default to
	  IW_MODE_AUTO, not -1, which is more in line with our previous
	  behavior.  Otherwise, we try to set the wireless mode to -1 in
	  nm_device_set_mode().


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1147 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Robert Love 2005-12-08 15:40:24 +00:00 committed by Robert Love
parent 510458f78f
commit dec36b0540
2 changed files with 9 additions and 2 deletions

View file

@ -1,3 +1,10 @@
2005-12-08 Robert Love <rml@novell.com>
* src/NetworkManagerDevice.c: We want to fall back on and default to
IW_MODE_AUTO, not -1, which is more in line with our previous
behavior. Otherwise, we try to set the wireless mode to -1 in
nm_device_set_mode().
2005-12-07 Robert Love <rml@novell.com>
* gnome/applet/applet-dbus-info.c, include/NetworkManager.h,

View file

@ -1926,7 +1926,7 @@ static gboolean nm_device_bring_down_wait (NMDevice *dev, gboolean cancelable)
int nm_device_get_mode (NMDevice *dev)
{
NMSock * sk;
int mode = -1;
int mode = IW_MODE_AUTO;
g_return_val_if_fail (dev != NULL, -1);
g_return_val_if_fail (nm_device_is_802_11_wireless (dev), -1);
@ -1967,7 +1967,7 @@ gboolean nm_device_set_mode (NMDevice *dev, const int mode)
g_return_val_if_fail (dev != NULL, FALSE);
g_return_val_if_fail (nm_device_is_802_11_wireless (dev), FALSE);
g_return_val_if_fail ((mode == IW_MODE_INFRA) || (mode == IW_MODE_ADHOC), FALSE);
g_return_val_if_fail ((mode == IW_MODE_INFRA) || (mode == IW_MODE_ADHOC) || (mode == IW_MODE_AUTO), FALSE);
if (nm_device_get_mode (dev) == mode)
return TRUE;