summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoao Machado <jocrismachado@gmail.com>2023-03-11 15:25:09 +0000
committerBeniamino Galvani <bgalvani@redhat.com>2023-03-13 09:46:53 +0100
commitbe8ddf367f42a8f0db7f6786ba4900bd1c627309 (patch)
tree3ed29dc6c09e6a073c7e9aaa5cda3f931e054722
parent429f36cd81ddbe337f04c09a352fd78cd29e394d (diff)
downloadNetworkManager-be8ddf367f42a8f0db7f6786ba4900bd1c627309.tar.gz
libnm-core-impl: allow ip6 tunnel flags for ip6gre & ip6gretap
(cherry picked from commit a239317a6b760940658dae3d4bb027032fc0c70b)
-rw-r--r--src/libnm-core-impl/nm-setting-ip-tunnel.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/libnm-core-impl/nm-setting-ip-tunnel.c b/src/libnm-core-impl/nm-setting-ip-tunnel.c
index 7fb8b01739..1345ef14d0 100644
--- a/src/libnm-core-impl/nm-setting-ip-tunnel.c
+++ b/src/libnm-core-impl/nm-setting-ip-tunnel.c
@@ -491,7 +491,11 @@ verify(NMSetting *setting, NMConnection *connection, GError **error)
}
flags = priv->flags;
- if (NM_IN_SET(priv->mode, NM_IP_TUNNEL_MODE_IPIP6, NM_IP_TUNNEL_MODE_IP6IP6))
+ if (NM_IN_SET(priv->mode,
+ NM_IP_TUNNEL_MODE_IPIP6,
+ NM_IP_TUNNEL_MODE_IP6IP6,
+ NM_IP_TUNNEL_MODE_IP6GRE,
+ NM_IP_TUNNEL_MODE_IP6GRETAP))
flags &= (guint32) (~_NM_IP_TUNNEL_FLAG_ALL_IP6TNL);
if (flags) {
g_set_error(error,