diff options
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | docs/libnm/Makefile.am | 1 | ||||
| -rw-r--r-- | docs/libnm/meson.build | 1 | ||||
| -rw-r--r-- | src/core/platform/nm-platform.h | 1 | ||||
| -rw-r--r-- | src/libnm-base/nm-base.h | 12 | ||||
| -rw-r--r-- | src/libnm-core-impl/nm-setting-macsec.c | 1 | ||||
| -rw-r--r-- | src/libnm-core-impl/nm-setting-vlan.c | 1 | ||||
| -rw-r--r-- | src/libnm-core-intern/nm-core-internal.h | 1 | ||||
| -rw-r--r-- | src/libnm-core-intern/nm-core-types-internal.h | 23 |
9 files changed, 12 insertions, 30 deletions
diff --git a/Makefile.am b/Makefile.am index 5cd624ff1e..50ee93b287 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1201,7 +1201,6 @@ src_libnm_core_impl_lib_h_priv = \ src/libnm-core-impl/nm-team-utils.h \ src/libnm-core-impl/nm-utils-private.h \ src/libnm-core-intern/nm-core-internal.h \ - src/libnm-core-intern/nm-core-types-internal.h \ src/libnm-core-intern/nm-keyfile-internal.h \ src/libnm-core-intern/nm-keyfile-utils.h \ src/libnm-core-intern/nm-meta-setting-base-impl.h \ diff --git a/docs/libnm/Makefile.am b/docs/libnm/Makefile.am index 3de6976b70..17244c1226 100644 --- a/docs/libnm/Makefile.am +++ b/docs/libnm/Makefile.am @@ -41,7 +41,6 @@ IGNORE_HFILES= \ common.h \ nm-core-internal.h \ nm-core-tests-enum-types.h \ - nm-core-types-internal.h \ nm-crypto-impl.h \ nm-crypto.h \ nm-dbus-helpers.h \ diff --git a/docs/libnm/meson.build b/docs/libnm/meson.build index 746335c4ce..5a87b62a76 100644 --- a/docs/libnm/meson.build +++ b/docs/libnm/meson.build @@ -4,7 +4,6 @@ private_headers = [ 'common.h', 'nm-core-internal.h', 'nm-core-tests-enum-types.h', - 'nm-core-types-internal.h', 'nm-crypto-impl.h', 'nm-crypto.h', 'nm-dbus-helpers.h', diff --git a/src/core/platform/nm-platform.h b/src/core/platform/nm-platform.h index a659a675df..ce16ae9899 100644 --- a/src/core/platform/nm-platform.h +++ b/src/core/platform/nm-platform.h @@ -7,7 +7,6 @@ #define __NETWORKMANAGER_PLATFORM_H__ #include "nm-dbus-interface.h" -#include "libnm-core-intern/nm-core-types-internal.h" #include "libnm-platform/nmp-base.h" #include "libnm-base/nm-base.h" diff --git a/src/libnm-base/nm-base.h b/src/libnm-base/nm-base.h index 483e40e1f2..138e8b04b2 100644 --- a/src/libnm-base/nm-base.h +++ b/src/libnm-base/nm-base.h @@ -352,6 +352,18 @@ NM_IS_IP_CONFIG_SOURCE_RTPROT(NMIPConfigSource source) #define NM_BRIDGE_VLAN_DEFAULT_PVID_DEF 1u +/*****************************************************************************/ + +typedef struct { + guint32 from; + guint32 to; +} NMVlanQosMapping; + +#define _NM_IP_TUNNEL_FLAG_ALL_IP6TNL \ + (NM_IP_TUNNEL_FLAG_IP6_IGN_ENCAP_LIMIT | NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_TCLASS \ + | NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_FLOWLABEL | NM_IP_TUNNEL_FLAG_IP6_MIP6_DEV \ + | NM_IP_TUNNEL_FLAG_IP6_RCV_DSCP_COPY | NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_FWMARK) + /****************************************************************************/ #endif /* __NM_LIBNM_BASE_H__ */ diff --git a/src/libnm-core-impl/nm-setting-macsec.c b/src/libnm-core-impl/nm-setting-macsec.c index f9a3a7818c..8cb0f280e0 100644 --- a/src/libnm-core-impl/nm-setting-macsec.c +++ b/src/libnm-core-impl/nm-setting-macsec.c @@ -12,7 +12,6 @@ #include "libnm-glib-aux/nm-secret-utils.h" #include "nm-utils.h" -#include "libnm-core-intern/nm-core-types-internal.h" #include "nm-setting-connection.h" #include "nm-setting-private.h" #include "nm-setting-wired.h" diff --git a/src/libnm-core-impl/nm-setting-vlan.c b/src/libnm-core-impl/nm-setting-vlan.c index e0cad6a614..0d2855587b 100644 --- a/src/libnm-core-impl/nm-setting-vlan.c +++ b/src/libnm-core-impl/nm-setting-vlan.c @@ -11,7 +11,6 @@ #include "libnm-core-aux-intern/nm-libnm-core-utils.h" #include "nm-utils.h" -#include "libnm-core-intern/nm-core-types-internal.h" #include "nm-setting-connection.h" #include "nm-setting-private.h" #include "nm-setting-wired.h" diff --git a/src/libnm-core-intern/nm-core-internal.h b/src/libnm-core-intern/nm-core-internal.h index fa05f51989..8b3ae0c097 100644 --- a/src/libnm-core-intern/nm-core-internal.h +++ b/src/libnm-core-intern/nm-core-internal.h @@ -23,7 +23,6 @@ #include "libnm-base/nm-base.h" #include "nm-connection.h" #include "nm-core-enum-types.h" -#include "nm-core-types-internal.h" #include "nm-meta-setting-base.h" #include "nm-setting-6lowpan.h" #include "nm-setting-8021x.h" diff --git a/src/libnm-core-intern/nm-core-types-internal.h b/src/libnm-core-intern/nm-core-types-internal.h deleted file mode 100644 index 346458d359..0000000000 --- a/src/libnm-core-intern/nm-core-types-internal.h +++ /dev/null @@ -1,23 +0,0 @@ -/* SPDX-License-Identifier: LGPL-2.1-or-later */ -/* - * Copyright (C) 2015 Red Hat, Inc. - */ - -#ifndef NM_CORE_TYPES_INTERNAL_H -#define NM_CORE_TYPES_INTERNAL_H - -#if !((NETWORKMANAGER_COMPILATION) &NM_NETWORKMANAGER_COMPILATION_WITH_LIBNM_CORE_INTERNAL) - #error Cannot use this header. -#endif - -typedef struct { - guint32 from; - guint32 to; -} NMVlanQosMapping; - -#define _NM_IP_TUNNEL_FLAG_ALL_IP6TNL \ - (NM_IP_TUNNEL_FLAG_IP6_IGN_ENCAP_LIMIT | NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_TCLASS \ - | NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_FLOWLABEL | NM_IP_TUNNEL_FLAG_IP6_MIP6_DEV \ - | NM_IP_TUNNEL_FLAG_IP6_RCV_DSCP_COPY | NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_FWMARK) - -#endif /* NM_CORE_TYPES_INTERNAL_H */ |