From c83b40aca76fc0ed624a6c9e71dbd7b0abfa13f2 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Sun, 16 Nov 2014 16:07:22 +0100 Subject: device: Remove unmanaged slaves from master when they disappear We've previously been just watching for state changes into UNMANAGED state. No state change is emitted upon removal of a device which is already unmanaged. https://bugzilla.gnome.org/show_bug.cgi?id=737659 --- src/devices/nm-device.c | 17 +++++++++++++++++ src/devices/nm-device.h | 2 ++ src/nm-manager.c | 1 + 3 files changed, 20 insertions(+) diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index 2a3ef8da69..56ecfcaf4b 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -1602,6 +1602,23 @@ nm_device_get_enslaved (NMDevice *self) return NM_DEVICE_GET_PRIVATE (self)->enslaved; } +/** + * nm_device_removed: + * @self: the #NMDevice + * + * Called by the manager when the device was removed. Releases the device from + * the master in case it's enslaved. + */ +void +nm_device_removed (NMDevice *self) +{ + NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self); + + if (priv->enslaved) + nm_device_release_one_slave (priv->master, self, TRUE, NM_DEVICE_STATE_REASON_REMOVED); +} + + static gboolean is_available (NMDevice *self) { diff --git a/src/devices/nm-device.h b/src/devices/nm-device.h index 64687f7cbe..9d0ff78179 100644 --- a/src/devices/nm-device.h +++ b/src/devices/nm-device.h @@ -253,6 +253,8 @@ NMDevice * nm_device_get_master (NMDevice *dev); NMActRequest * nm_device_get_act_request (NMDevice *dev); NMConnection * nm_device_get_connection (NMDevice *dev); +void nm_device_removed (NMDevice *dev); + gboolean nm_device_is_available (NMDevice *dev); gboolean nm_device_has_carrier (NMDevice *dev); diff --git a/src/nm-manager.c b/src/nm-manager.c index 04192a98b1..2636cc4b93 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -762,6 +762,7 @@ remove_device (NMManager *manager, g_signal_emit (manager, signals[DEVICE_REMOVED], 0, device); g_object_notify (G_OBJECT (manager), NM_MANAGER_DEVICES); + nm_device_removed (device); nm_dbus_manager_unregister_object (priv->dbus_mgr, device); g_object_unref (device); -- cgit v1.2.1