Merge tag 'upstream/1.2.0'

Upstream version 1.2.0

1 files changed, 9 insertions, 1 deletions

diff --git a/src/devices/nm-device.h b/src/devices/nm-device.h
index 368e77f7..9f689850 100644
--- a/src/devices/nm-device.h
+++ b/src/devices/nm-device.h
@@ -180,6 +180,14 @@ typedef struct {
 	void        (*realize_start_notify) (NMDevice *self, const NMPlatformLink *plink);
 
 	/**
+	 * unrealize():
+	 * @self: the #NMDevice
+	 *
+	 * Remove the device backing resources.
+	 */
+	gboolean               (*unrealize) (NMDevice *self, GError **error);
+
+	/**
 	 * unrealize_notify():
 	 * @self: the #NMDevice
 	 *
@@ -377,7 +385,7 @@ gboolean        nm_device_has_unmodified_applied_connection (NMDevice *self,
                                                              NMSettingCompareFlags compare_flags);
 NMSetting *     nm_device_get_applied_setting   (NMDevice *dev, GType setting_type);
 
-void            nm_device_removed               (NMDevice *dev);
+void            nm_device_removed               (NMDevice *self, gboolean unconfigure_ip_config);
 
 gboolean        nm_device_is_available          (NMDevice *dev, NMDeviceCheckDevAvailableFlags flags);
 gboolean        nm_device_has_carrier           (NMDevice *dev);