summaryrefslogtreecommitdiff
path: root/src/nm-types.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/nm-types.h')
-rw-r--r--src/nm-types.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/nm-types.h b/src/nm-types.h
index 1a002ac3f..5806e15db 100644
--- a/src/nm-types.h
+++ b/src/nm-types.h
@@ -127,6 +127,12 @@ typedef enum {
NMP_OBJECT_TYPE_MAX = __NMP_OBJECT_TYPE_LAST - 1,
} NMPObjectType;
+typedef enum {
+ NM_IP_CONFIG_MERGE_DEFAULT = 0,
+ NM_IP_CONFIG_MERGE_NO_ROUTES = (1LL << 0),
+ NM_IP_CONFIG_MERGE_NO_DNS = (1LL << 1),
+} NMIPConfigMergeFlags;
+
/* settings */
typedef struct _NMAgentManager NMAgentManager;
typedef struct _NMSecretAgent NMSecretAgent;