summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2016-01-20 17:46:04 +0100
committerThomas Haller <thaller@redhat.com>2016-01-24 16:07:01 +0100
commit4ab3fd37f9636e43bbc8a733745e06c3a6994d29 (patch)
treec19f11833e039ed6c565e5f93afba309d4eb5622
parent02ec76df5aaa3a3ad197cb1d53c0388029775b07 (diff)
downloadNetworkManager-4ab3fd37f9636e43bbc8a733745e06c3a6994d29.tar.gz
device: add _NM_DEVICE_CHECK_CON_AVAILABLE_FOR_USER_REQUEST enum
NM_DEVICE_CHECK_CON_AVAILABLE_FOR_USER_REQUEST is a multi-flag value combining all the hooks that compose a user-request. Add a special value that has no esplicit meaning except that it ~is~ a user-request.
-rw-r--r--src/devices/nm-device.h10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/devices/nm-device.h b/src/devices/nm-device.h
index e173b2db9f..c56dfde8ba 100644
--- a/src/devices/nm-device.h
+++ b/src/devices/nm-device.h
@@ -103,12 +103,14 @@ typedef enum NMActStageReturn NMActStageReturn;
typedef enum { /*< skip >*/
NM_DEVICE_CHECK_CON_AVAILABLE_NONE = 0,
- _NM_DEVICE_CHECK_CON_AVAILABLE_FOR_USER_REQUEST_WAITING_CARRIER = (1L << 0),
- _NM_DEVICE_CHECK_CON_AVAILABLE_FOR_USER_REQUEST_IGNORE_AP = (1L << 1),
- NM_DEVICE_CHECK_CON_AVAILABLE_FOR_USER_REQUEST = _NM_DEVICE_CHECK_CON_AVAILABLE_FOR_USER_REQUEST_WAITING_CARRIER
+ _NM_DEVICE_CHECK_CON_AVAILABLE_FOR_USER_REQUEST = (1L << 0),
+ _NM_DEVICE_CHECK_CON_AVAILABLE_FOR_USER_REQUEST_WAITING_CARRIER = (1L << 1),
+ _NM_DEVICE_CHECK_CON_AVAILABLE_FOR_USER_REQUEST_IGNORE_AP = (1L << 2),
+ NM_DEVICE_CHECK_CON_AVAILABLE_FOR_USER_REQUEST = _NM_DEVICE_CHECK_CON_AVAILABLE_FOR_USER_REQUEST
+ | _NM_DEVICE_CHECK_CON_AVAILABLE_FOR_USER_REQUEST_WAITING_CARRIER
| _NM_DEVICE_CHECK_CON_AVAILABLE_FOR_USER_REQUEST_IGNORE_AP,
- NM_DEVICE_CHECK_CON_AVAILABLE_ALL = (1L << 2) - 1,
+ NM_DEVICE_CHECK_CON_AVAILABLE_ALL = (1L << 3) - 1,
} NMDeviceCheckConAvailableFlags;
struct _NMDevicePrivate;