From: Tom Gundersen <teg@jklm.no>
Date: Wed, 28 Jan 2015 16:32:50 +0000 (+0100)
Subject: networkd: tunnel - call tunnel modes ipip6, not ip4ipv6 to match ip(8)
X-Git-Tag: v219~234
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;ds=sidebyside;h=73b23bea8666f9c6d01d595ebbdbf7e78680c0ea;p=elogind.git

networkd: tunnel - call tunnel modes ipip6, not ip4ipv6 to match ip(8)
---

diff --git a/man/systemd.netdev.xml b/man/systemd.netdev.xml
index c4df0b7f9..f7acf3477 100644
--- a/man/systemd.netdev.xml
+++ b/man/systemd.netdev.xml
@@ -377,9 +377,9 @@
                                 <varlistentry>
                                   <term><varname>Mode=</varname></term>
                                   <listitem>
-                                    <para>IPv6 tunnels can have three modes:
-                                    <literal>ip6ip6</literal>,
-                                    <literal>ip4ipv6</literal>,
+                                    <para>IPv6 tunnels can have three mode
+                                    <literal>ip6ip6</literal>
+                                    <literal>ipip6</literal>,
                                     <literal>any</literal>
                                     </para>
                                   </listitem>
diff --git a/src/network/networkd-netdev-tunnel.c b/src/network/networkd-netdev-tunnel.c
index 89a9096bc..e95082d11 100644
--- a/src/network/networkd-netdev-tunnel.c
+++ b/src/network/networkd-netdev-tunnel.c
@@ -38,7 +38,7 @@
 
 static const char* const ip6tnl_mode_table[_NETDEV_IP6_TNL_MODE_MAX] = {
         [NETDEV_IP6_TNL_MODE_IP6IP6] = "ip6ip6",
-        [NETDEV_IP6_TNL_MODE_IPIP6] = "ip4ipv6",
+        [NETDEV_IP6_TNL_MODE_IPIP6] = "ipip6",
         [NETDEV_IP6_TNL_MODE_ANYIP6] = "any",
 };