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

* src/NetworkManager.c
		- (nm_wired_link_deactivated): actually ignore netlink events from
			wireless devices.


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@504 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams
2005-03-22 21:27:51 +00:00
parent a068f66a28
commit b90aa8077a
2 changed files with 15 additions and 11 deletions

View File

@@ -1,3 +1,15 @@
2005-03-22 Dan Williams <dcbw@redhat.com>
* src/NetworkManager.c
- (nm_wired_link_deactivated): actually ignore netlink events from
wireless devices.
2005-03-22 Dan Williams <dcbw@redhat.com>
* src/NetworkManager.c
- (nm_wired_link_activated): actually ignore netlink events from
wireless devices.
2005-03-17 Dan Williams <dcbw@redhat.com> 2005-03-17 Dan Williams <dcbw@redhat.com>
Patch from Tom Parker: Patch from Tom Parker:

View File

@@ -595,9 +595,6 @@ nm_wired_link_activated (NmNetlinkMonitor *monitor,
nm_policy_schedule_state_update (data); nm_policy_schedule_state_update (data);
} }
} }
else
nm_info ("unknown wired ethernet interface '%s' "
"activated\n", interface_name);
nm_unlock_mutex (data->dev_list_mutex, __FUNCTION__); nm_unlock_mutex (data->dev_list_mutex, __FUNCTION__);
} }
} }
@@ -607,17 +604,12 @@ nm_wired_link_deactivated (NmNetlinkMonitor *monitor,
const gchar *interface_name, const gchar *interface_name,
NMData *data) NMData *data)
{ {
NMDevice *device;
if (nm_try_acquire_mutex (data->dev_list_mutex, __FUNCTION__)) if (nm_try_acquire_mutex (data->dev_list_mutex, __FUNCTION__))
{ {
device = nm_get_device_by_iface (data, interface_name); NMDevice *dev = nm_get_device_by_iface (data, interface_name);
if (device != NULL) if ((dev != NULL) && nm_device_is_wired (dev))
nm_device_set_link_active (device, FALSE); nm_device_set_link_active (dev, FALSE);
else
nm_info ("unknown wired ethernet interface '%s' "
"deactivated\n", interface_name);
nm_unlock_mutex (data->dev_list_mutex, __FUNCTION__); nm_unlock_mutex (data->dev_list_mutex, __FUNCTION__);
} }
} }