summaryrefslogtreecommitdiff
path: root/man/systemd.netdev.xml
diff options
context:
space:
mode:
Diffstat (limited to 'man/systemd.netdev.xml')
-rw-r--r--man/systemd.netdev.xml39
1 files changed, 31 insertions, 8 deletions
diff --git a/man/systemd.netdev.xml b/man/systemd.netdev.xml
index ff7b85453f..298cf0eb84 100644
--- a/man/systemd.netdev.xml
+++ b/man/systemd.netdev.xml
@@ -80,11 +80,9 @@
<filename>/run</filename> take precedence over files with the same
name in <filename>/usr/lib</filename>. This can be used to
override a system-supplied configuration file with a local file if
- needed; a symlink in <filename>/etc</filename> with the same name
- as a configuration file in <filename>/usr/lib</filename>, pointing
- to <filename>/dev/null</filename>, disables the configuration file
- entirely.</para>
-
+ needed. As a special case, an empty file (file size 0) or symlink
+ with the same name pointing to <filename>/dev/null</filename>,
+ disable the configuration file entirely (it is "masked").</para>
</refsect1>
<refsect1>
@@ -491,6 +489,31 @@
</listitem>
</varlistentry>
<varlistentry>
+ <term><varname>IPv6FlowLabel=</varname></term>
+ <listitem>
+ <para>Configures The 20-bit Flow Label (see <ulink url="https://tools.ietf.org/html/rfc6437">
+ RFC 6437</ulink>) field in the IPv6 header (see <ulink url="https://tools.ietf.org/html/rfc2460">
+ RFC 2460</ulink>), is used by a node to label packets of a flow.
+ It's only used for IPv6 Tunnels.
+ A Flow Label of zero is used to indicate packets that have
+ not been labeled. Takes following values.
+ When <literal>inherit</literal> it uses the original flowlabel,
+ or can be configured to any value between 0 to 0xFFFFF.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><varname>CopyDSCP=</varname></term>
+ <listitem>
+ <para>A boolean. When true, the Differentiated Service Code
+ Point (DSCP) field will be copied to the inner header from
+ outer header during the decapsulation of an IPv6 tunnel
+ packet. DSCP is a field in an IP packet that enables different
+ levels of service to be assigned to network traffic.
+ Defaults to <literal>no</literal>.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
<term><varname>Mode=</varname></term>
<listitem>
<para>An <literal>ip6tnl</literal> tunnels can have three
@@ -563,7 +586,7 @@
</listitem>
</varlistentry>
<varlistentry>
- <term><varname>VnetHeader=</varname></term>
+ <term><varname>VNetHeader=</varname></term>
<listitem><para>Takes a boolean argument. Configures
IFF_VNET_HDR flag for a tap device. It allows sending
and receiving larger Generic Segmentation Offload (GSO)
@@ -654,7 +677,7 @@
<listitem>
<para>Specifies the frequency that Media Independent
Interface link monitoring will occur. A value of zero
- disables MII link monitoring. This values is rounded down to
+ disables MII link monitoring. This value is rounded down to
the nearest millisecond. The default value is 0.</para>
</listitem>
</varlistentry>
@@ -798,7 +821,7 @@
<listitem>
<para> Specify the number of packets to transmit through a slave before
moving to the next one. When set to 0 then a slave is chosen at
- random.The valid range is (0 - 65535). Defaults to 1. This option
+ random. The valid range is (0 - 65535). Defaults to 1. This option
has effect only in balance-rr mode.
</para>
</listitem>