From f3c6d0765dff885e168b94f28e06ecc640315a74 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 31 Jan 2020 12:10:14 +0100 Subject: New upstream version 1.22.6 --- src/devices/nm-device.h | 1 + 1 file changed, 1 insertion(+) (limited to 'src/devices/nm-device.h') diff --git a/src/devices/nm-device.h b/src/devices/nm-device.h index 518c66ca..66f9aa97 100644 --- a/src/devices/nm-device.h +++ b/src/devices/nm-device.h @@ -53,6 +53,7 @@ nm_device_state_reason_check (NMDeviceStateReason reason) } #define NM_PENDING_ACTION_AUTOACTIVATE "autoactivate" +#define NM_PENDING_ACTION_IN_STATE_CHANGE "in-state-change" #define NM_PENDING_ACTION_RECHECK_AVAILABLE "recheck-available" #define NM_PENDING_ACTION_CARRIER_WAIT "carrier-wait" #define NM_PENDING_ACTION_WAITING_FOR_SUPPLICANT "waiting-for-supplicant" -- cgit 1.3.0-6-gf8a5 From e536d40eaea5dcdc0743b0a5e8e17faa46608a50 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 19 Feb 2020 23:31:24 +0100 Subject: New upstream version 1.22.8 --- src/devices/nm-device.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/devices/nm-device.h') diff --git a/src/devices/nm-device.h b/src/devices/nm-device.h index 66f9aa97..8c6c856e 100644 --- a/src/devices/nm-device.h +++ b/src/devices/nm-device.h @@ -437,11 +437,13 @@ typedef struct _NMDeviceClass { NMConnection *con_old, NMConnection *con_new); - guint32 (* get_dhcp_timeout) (NMDevice *self, - int addr_family); + guint32 (* get_dhcp_timeout_for_device) (NMDevice *self, + int addr_family); gboolean (* get_guessed_metered) (NMDevice *self); + gboolean (* can_update_from_platform_link) (NMDevice *self, const NMPlatformLink *plink); + /* Controls, whether to call act_stage2_config() callback also for assuming * a device or for external activations. In this case, act_stage2_config() must * take care not to touch the device's configuration. */ -- cgit 1.3.0-6-gf8a5