diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2020-02-26 16:32:44 +0100 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2020-02-26 16:32:44 +0100 |
| commit | 447eb1ee6c50e2cac4009e66add3c1d449822589 (patch) | |
| tree | 7bc7db8f5d7e12137e758ea03ebe5c1eb8b07a23 /src/devices/nm-device.h | |
| parent | 0b818c504ebbb9454b501c532be8603bf383e37a (diff) | |
| parent | 3cbb3d6ecfef1076fc757632ee8327935250afee (diff) | |
Merge remote-tracking branch 'salsa/debian/master' into ubuntu/master
Diffstat (limited to 'src/devices/nm-device.h')
| -rw-r--r-- | src/devices/nm-device.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/devices/nm-device.h b/src/devices/nm-device.h index 518c66ca..8c6c856e 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" @@ -436,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. */ |