diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2020-07-02 11:35:14 +0200 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2020-07-02 11:52:25 +0200 |
| commit | c6c4e39b012d544c1f1ed816686c8ae1599da793 (patch) | |
| tree | 094d5e07c1d135d0ee67d99e051fd6a9a367a6a4 /src/devices/nm-device.h | |
| parent | 7368e45ff5b3b8b328d55408bcd403e4d6c564d0 (diff) | |
| parent | acd7b014c72673f5b0c0b91309e27028886da167 (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 | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/devices/nm-device.h b/src/devices/nm-device.h index 8d51c707..36cae7a3 100644 --- a/src/devices/nm-device.h +++ b/src/devices/nm-device.h @@ -66,6 +66,7 @@ nm_device_state_reason_check (NMDeviceStateReason reason) /* Properties */ #define NM_DEVICE_UDI "udi" +#define NM_DEVICE_PATH "path" #define NM_DEVICE_IFACE "interface" #define NM_DEVICE_IP_IFACE "ip-interface" #define NM_DEVICE_DRIVER "driver" @@ -445,9 +446,10 @@ typedef struct _NMDeviceClass { gboolean (* set_platform_mtu) (NMDevice *self, guint32 mtu); - /* Controls, whether to call act_stage2_config() callback also for assuming - * a device or for external activations. In this case, act_stage2_config() must + /* Control whether to call stage1 and stage2 callbacks also for assuming + * a device or for external activations. In this case, the callback must * take care not to touch the device's configuration. */ + bool act_stage1_prepare_also_for_external_or_assume:1; bool act_stage2_config_also_for_external_or_assume:1; bool act_stage1_prepare_set_hwaddr_ethernet:1; |