diff options
| author | Thomas Haller <thaller@redhat.com> | 2016-08-31 18:51:16 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2016-09-09 14:10:27 +0200 |
| commit | 2162a84c5fd191fe6de171412958473c0b6f4487 (patch) | |
| tree | 5b3f9e2edfc593da72a2d93d6e8a0dece8a3447d /src/devices/nm-device-private.h | |
| parent | 398e1e8b3c7e63161e7a3c8ac614bb29fd7e3e7c (diff) | |
| download | NetworkManager-2162a84c5fd191fe6de171412958473c0b6f4487.tar.gz | |
device/trivial: rename NM_ACT_STAGE_RETURN_STOP to NM_ACT_STAGE_RETURN_IP_FAIL
and rename NM_ACT_STAGE_RETURN_STOP to NM_ACT_STAGE_RETURN_IP_FAIL.
They are only used during IP config stage. Give them a better name.
Diffstat (limited to 'src/devices/nm-device-private.h')
| -rw-r--r-- | src/devices/nm-device-private.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/devices/nm-device-private.h b/src/devices/nm-device-private.h index a91bb422f2..0274431bb9 100644 --- a/src/devices/nm-device-private.h +++ b/src/devices/nm-device-private.h @@ -27,11 +27,11 @@ /* This file should only be used by subclasses of NMDevice */ enum NMActStageReturn { - NM_ACT_STAGE_RETURN_FAILURE = 0, + NM_ACT_STAGE_RETURN_FAILURE = 0, /* Hard failure of activation */ 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 not wanted */ + NM_ACT_STAGE_RETURN_IP_WAIT, /* IP config stage is waiting (state IP_WAIT) */ + NM_ACT_STAGE_RETURN_IP_FAIL, /* IP config stage failed (state IP_FAIL), activation may proceed */ }; #define NM_DEVICE_CAP_NONSTANDARD_CARRIER 0x80000000 |