diff options
| author | Tom Gundersen <teg@jklm.no> | 2015-01-28 17:32:50 +0100 |
|---|---|---|
| committer | Tom Gundersen <teg@jklm.no> | 2015-01-28 21:35:54 +0100 |
| commit | 73b23bea8666f9c6d01d595ebbdbf7e78680c0ea (patch) | |
| tree | ebda2804aec3b2b374d3b356a9c86e43b9574bdd | |
| parent | be94d95499bf9c63fe9331e9b9ecc64f32fe9d79 (diff) | |
networkd: tunnel - call tunnel modes ipip6, not ip4ipv6 to match ip(8)
| -rw-r--r-- | man/systemd.netdev.xml | 6 | ||||
| -rw-r--r-- | src/network/networkd-netdev-tunnel.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/man/systemd.netdev.xml b/man/systemd.netdev.xml index c4df0b7f99..f7acf34770 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 89a9096bcd..e95082d119 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", }; |