1
1
mirror of https://github.com/systemd/systemd-stable.git synced 2024-12-22 13:33:56 +03:00

Merge pull request #21629 from yuwata/man-netdev-update

man: netdev: several cleanups
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2021-12-06 10:23:04 +01:00 committed by GitHub
commit ea7c87bfd9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -456,24 +456,14 @@
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term><varname>EgressQOSMaps=</varname></term> <term><varname>EgressQOSMaps=</varname></term>
<listitem>
<para>Defines a mapping of Linux internal packet priority (<constant>SO_PRIORITY</constant>) to VLAN header
PCP field for outgoing frames. Takes a whitespace-separated list of unsigned integer pairs in the format
<literal>from</literal>-<literal>to</literal>, e.g., <literal>21-7 45-5</literal> ranges 14294967294.
Note that <literal>from</literal> must be greater than or equal to <literal>to</literal>. When unset,
the kernel's default will be used.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term><varname>IngressQOSMaps=</varname></term> <term><varname>IngressQOSMaps=</varname></term>
<listitem> <listitem>
<para>Defines a mapping of Linux internal packet priority (<constant>SO_PRIORITY</constant>) to VLAN header <para>Defines a mapping of Linux internal packet priority (<constant>SO_PRIORITY</constant>)
PCP field for incoming frames. Takes a whitespace-separated list of unsigned integer pairs in the format to VLAN header PCP field for outgoing and incoming frames, respectively. Takes a
<literal>from</literal>-<literal>to</literal>, e.g., <literal>21-7 45-5</literal> ranges 14294967294. whitespace-separated list of integer pairs, where each integer must be in the range
Note that <literal>from</literal> must be greater than or equal to <literal>to</literal>. When unset, 1…4294967294, in the format <literal>from</literal>-<literal>to</literal>, e.g.,
the kernel's default will be used. <literal>21-7 45-5</literal>. Note that <literal>from</literal> must be greater than or equal
</para> to <literal>to</literal>. When unset, the kernel's default will be used.</para>
</listitem> </listitem>
</varlistentry> </varlistentry>
</variablelist> </variablelist>
@ -1230,7 +1220,7 @@
value of zero means that a packet carrying that option may not enter value of zero means that a packet carrying that option may not enter
another tunnel before exiting the current tunnel. another tunnel before exiting the current tunnel.
(see <ulink url="https://tools.ietf.org/html/rfc2473#section-4.1.1"> RFC 2473</ulink>). (see <ulink url="https://tools.ietf.org/html/rfc2473#section-4.1.1"> RFC 2473</ulink>).
The valid range is 0255 and <literal>none</literal>. Defaults to 4. The valid range is 0255 and <literal>none</literal>. Defaults to 4.
</para> </para>
</listitem> </listitem>
</varlistentry> </varlistentry>
@ -1769,7 +1759,7 @@
<listitem> <listitem>
<para>Specifies the delay before a link is enabled after a <para>Specifies the delay before a link is enabled after a
link up status has been detected. This value is rounded down link up status has been detected. This value is rounded down
to a multiple of MIIMonitorSec. The default value is to a multiple of <varname>MIIMonitorSec=</varname>. The default value is
0.</para> 0.</para>
</listitem> </listitem>
</varlistentry> </varlistentry>
@ -1779,7 +1769,7 @@
<listitem> <listitem>
<para>Specifies the delay before a link is disabled after a <para>Specifies the delay before a link is disabled after a
link down status has been detected. This value is rounded link down status has been detected. This value is rounded
down to a multiple of MIIMonitorSec. The default value is down to a multiple of <varname>MIIMonitorSec=</varname>. The default value is
0.</para> 0.</para>
</listitem> </listitem>
</varlistentry> </varlistentry>
@ -1789,7 +1779,7 @@
<listitem> <listitem>
<para>Specifies the number of seconds between instances where the bonding <para>Specifies the number of seconds between instances where the bonding
driver sends learning packets to each slave peer switch. driver sends learning packets to each slave peer switch.
The valid range is 10x7fffffff; the default value is 1. This option The valid range is 10x7fffffff; the default value is 1. This option
has an effect only for the balance-tlb and balance-alb modes.</para> has an effect only for the balance-tlb and balance-alb modes.</para>
</listitem> </listitem>
</varlistentry> </varlistentry>
@ -1870,8 +1860,8 @@
<term><varname>ARPIPTargets=</varname></term> <term><varname>ARPIPTargets=</varname></term>
<listitem> <listitem>
<para>Specifies the IP addresses to use as ARP monitoring peers when <para>Specifies the IP addresses to use as ARP monitoring peers when
ARPIntervalSec is greater than 0. These are the targets of the ARP request <varname>ARPIntervalSec=</varname> is greater than 0. These are the targets of the ARP
sent to determine the health of the link to the targets. request sent to determine the health of the link to the targets.
Specify these values in IPv4 dotted decimal format. At least one IP Specify these values in IPv4 dotted decimal format. At least one IP
address must be given for ARP monitoring to function. The address must be given for ARP monitoring to function. The
maximum number of targets that can be specified is 16. The maximum number of targets that can be specified is 16. The
@ -1883,7 +1873,7 @@
<varlistentry> <varlistentry>
<term><varname>ARPAllTargets=</varname></term> <term><varname>ARPAllTargets=</varname></term>
<listitem> <listitem>
<para>Specifies the quantity of ARPIPTargets that must be reachable <para>Specifies the quantity of <varname>ARPIPTargets=</varname> that must be reachable
in order for the ARP monitor to consider a slave as being up. in order for the ARP monitor to consider a slave as being up.
This option affects only active-backup mode for slaves with This option affects only active-backup mode for slaves with
ARPValidate enabled. Possible values are ARPValidate enabled. Possible values are
@ -1914,7 +1904,7 @@
<para>Specifies the number of IGMP membership reports to be issued after <para>Specifies the number of IGMP membership reports to be issued after
a failover event. One membership report is issued immediately after a failover event. One membership report is issued immediately after
the failover, subsequent packets are sent in each 200ms interval. the failover, subsequent packets are sent in each 200ms interval.
The valid range is 0255. Defaults to 1. A value of 0 The valid range is 0255. Defaults to 1. A value of 0
prevents the IGMP membership report from being issued in response prevents the IGMP membership report from being issued in response
to the failover event. to the failover event.
</para> </para>
@ -1926,7 +1916,7 @@
<listitem> <listitem>
<para>Specify the number of packets to transmit through a slave before <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 moving to the next one. When set to 0, then a slave is chosen at
random. The valid range is 065535. Defaults to 1. This option random. The valid range is 065535. Defaults to 1. This option
only has effect when in balance-rr mode. only has effect when in balance-rr mode.
</para> </para>
</listitem> </listitem>
@ -1941,7 +1931,7 @@
a peer notification is sent on the bonding device and each a peer notification is sent on the bonding device and each
VLAN sub-device. This is repeated at each link monitor interval VLAN sub-device. This is repeated at each link monitor interval
(ARPIntervalSec or MIIMonitorSec, whichever is active) if the number is (ARPIntervalSec or MIIMonitorSec, whichever is active) if the number is
greater than 1. The valid range is 0255. The default value is 1. greater than 1. The valid range is 0255. The default value is 1.
These options affect only the active-backup mode. These options affect only the active-backup mode.
</para> </para>
</listitem> </listitem>