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 c4df0b7f9954fb5feef63d9ca8525447eff62afc..f7acf34770ac7e53c6b68a29d4e49376128881d4 100644 (file)
--- 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 89a9096bcdfd9dd16a129e60df032e1989bb445c..e95082d119e6e169841c05deaa52d75b14944a7f 100644 (file)
--- 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",
 };