diff options
| author | Michael Biebl <biebl@debian.org> | 2015-05-05 17:49:11 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2015-05-05 17:49:11 +0200 |
| commit | e847e3cc3e4eded45a358bf838e1edcf4c12fcb5 (patch) | |
| tree | 9db16e390931b9b800a174c7117b9297b351283f /src/devices/nm-device-private.h | |
| parent | 1cd35b49de89f65c386ae2ff98a8e08342c080b0 (diff) | |
| parent | f408e27bccfacf347605a8d98649975a68f38a17 (diff) | |
Merge tag 'upstream/1.0.2'
Upstream version 1.0.2
Diffstat (limited to 'src/devices/nm-device-private.h')
| -rw-r--r-- | src/devices/nm-device-private.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/devices/nm-device-private.h b/src/devices/nm-device-private.h index 65a9a71a..1f781bbc 100644 --- a/src/devices/nm-device-private.h +++ b/src/devices/nm-device-private.h @@ -33,7 +33,8 @@ enum NMActStageReturn { NM_ACT_STAGE_RETURN_SUCCESS, /* Activation stage done */ NM_ACT_STAGE_RETURN_POSTPONE, /* Long-running operation in progress */ NM_ACT_STAGE_RETURN_WAIT, /* Not ready to start stage; wait */ - NM_ACT_STAGE_RETURN_STOP /* Activation stage done; nothing to do */ + NM_ACT_STAGE_RETURN_STOP, /* Activation not wanted */ + NM_ACT_STAGE_RETURN_FINISH /* Activation stage done; nothing to do */ }; #define NM_DEVICE_CAP_NONSTANDARD_CARRIER 0x80000000 |