system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-10-15 04:24:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

2006-05-22 Robert Love <rml@novell.com>

Browse source 
* src/nm-device-802-11-wireless.c: Don't chain up to the parent's
	  stage4_timeout on failure unless the wireless network is Ad-Hoc.
	  99% of the time there is a real problem with wireless, and a
	  seemingly successful connection via Zeroconf just confuses the user.
	  And that 1% of the time the network is probably Ad-Hoc, anyhow.


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1757 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Robert Love 2006-05-22 21:24:19 +00:00 committed by Robert Love
parent 628bc77f10
commit e8f14d0ffc
2 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2006-05-22 Robert Love <rml@novell.com>
* src/nm-device-802-11-wireless.c: Don't chain up to the parent's
stage4_timeout on failure unless the wireless network is Ad-Hoc.
99% of the time there is a real problem with wireless, and a
seemingly successful connection via Zeroconf just confuses the user.
And that 1% of the time the network is probably Ad-Hoc, anyhow.
2006-05-22 Robert Love <rml@novell.com>
* src/backends/NetworkManagerSuSE.c: Reload, do not restart, ypbind and

10
src/nm-device-802-11-wireless.c
View file

@ -2979,16 +2979,22 @@ real_act_stage4_ip_config_timeout (NMDevice *dev,
nm_dbus_get_user_key_for_network (data->dbus_connection, req, TRUE);
ret = NM_ACT_STAGE_RETURN_POSTPONE;
}
else
else if (nm_ap_get_mode (ap) == IW_MODE_ADHOC)
{
NMDevice80211WirelessClass * klass;
NMDeviceClass * parent_class;
/* Chain up to parent */
/* For Ad-Hoc networks, chain up to parent to get a Zeroconf IP */
klass = NM_DEVICE_802_11_WIRELESS_GET_CLASS (self);
parent_class = NM_DEVICE_CLASS (g_type_class_peek_parent (klass));
ret = parent_class->act_stage4_ip_config_timeout (dev, req, &real_config);
}
else
{
/* Non-encrypted network and IP configure failed. Alert the user. */
ret = NM_ACT_STAGE_RETURN_FAILURE;
}
*config = real_config;
return ret;