diff options
| author | Thomas Haller <thaller@redhat.com> | 2015-12-09 12:08:40 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2015-12-09 12:08:40 +0100 |
| commit | 2d1d187493365316c216743c365077e0220259b0 (patch) | |
| tree | 8f544be026ba6770017c5ea36692f85a1ae76435 | |
| parent | 7eeadc2caf602b9b67676c463b4cbcffa57bebc5 (diff) | |
| download | NetworkManager-2d1d187493365316c216743c365077e0220259b0.tar.gz | |
device: add NM_DEVICE_CHECK_DEV_AVAILABLE_FOR_USER_REQUEST flag
This generalizes _NM_DEVICE_CHECK_DEV_AVAILABLE_IGNORE_CARRIER.
| -rw-r--r-- | src/devices/nm-device.c | 8 | ||||
| -rw-r--r-- | src/devices/nm-device.h | 7 |
2 files changed, 8 insertions, 7 deletions
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index 21f5a194a9..8e6123a28c 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -2505,7 +2505,7 @@ is_available (NMDevice *self, NMDeviceCheckDevAvailableFlags flags) if (priv->carrier || priv->ignore_carrier) return TRUE; - if (NM_FLAGS_HAS (flags, NM_DEVICE_CHECK_DEV_AVAILABLE_IGNORE_CARRIER)) + if (NM_FLAGS_HAS (flags, _NM_DEVICE_CHECK_DEV_AVAILABLE_IGNORE_CARRIER)) return TRUE; return FALSE; @@ -8641,10 +8641,10 @@ _nm_device_check_connection_available (NMDevice *self, return FALSE; if ( state < NM_DEVICE_STATE_DISCONNECTED && !nm_device_is_software (self) - && ( ( !NM_FLAGS_HAS (flags, _NM_DEVICE_CHECK_CON_AVAILABLE_FOR_USER_REQUEST_WAITING_CARRIER) + && ( ( !NM_FLAGS_ANY (flags, NM_DEVICE_CHECK_CON_AVAILABLE_FOR_USER_REQUEST) && !nm_device_is_available (self, NM_DEVICE_CHECK_DEV_AVAILABLE_NONE)) - || ( NM_FLAGS_HAS (flags, _NM_DEVICE_CHECK_CON_AVAILABLE_FOR_USER_REQUEST_WAITING_CARRIER) - && !nm_device_is_available (self, NM_DEVICE_CHECK_DEV_AVAILABLE_IGNORE_CARRIER)))) + || ( NM_FLAGS_ANY (flags, NM_DEVICE_CHECK_CON_AVAILABLE_FOR_USER_REQUEST) + && !nm_device_is_available (self, NM_DEVICE_CHECK_DEV_AVAILABLE_FOR_USER_REQUEST)))) return FALSE; if (!nm_device_check_connection_compatible (self, connection)) diff --git a/src/devices/nm-device.h b/src/devices/nm-device.h index 26e8affd48..36f5cc68d1 100644 --- a/src/devices/nm-device.h +++ b/src/devices/nm-device.h @@ -124,10 +124,11 @@ struct _NMDevice { * a device appear more available. It can never make a device less available. */ typedef enum { /*< skip >*/ NM_DEVICE_CHECK_DEV_AVAILABLE_NONE = 0, - NM_DEVICE_CHECK_DEV_AVAILABLE_IGNORE_CARRIER = (1L << 0), - __NM_DEVICE_CHECK_DEV_AVAILABLE_ALL, - NM_DEVICE_CHECK_DEV_AVAILABLE_ALL = (((__NM_DEVICE_CHECK_DEV_AVAILABLE_ALL - 1) << 1) - 1), + _NM_DEVICE_CHECK_DEV_AVAILABLE_IGNORE_CARRIER = (1L << 0), + NM_DEVICE_CHECK_DEV_AVAILABLE_FOR_USER_REQUEST = _NM_DEVICE_CHECK_DEV_AVAILABLE_IGNORE_CARRIER, + + NM_DEVICE_CHECK_DEV_AVAILABLE_ALL = (1L << 1) - 1, } NMDeviceCheckDevAvailableFlags; typedef struct { |