Skip to content

Commit ea7c87b

Browse files
keszybzkeszybz
authored
Merge pull request systemd#21629 from yuwata/man-netdev-update
man: netdev: several cleanups
2 parents 8fc2648 + ee44b32 commit ea7c87b

File tree

1 file changed

+16
-26
lines changed

1 file changed

+16
-26
lines changed

‎man/systemd.netdev.xml‎

Lines changed: 16 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -456,24 +456,14 @@
456456
</varlistentry>
457457
<varlistentry>
458458
<term><varname>EgressQOSMaps=</varname></term>
459-
<listitem>
460-
<para>Defines a mapping of Linux internal packet priority (<constant>SO_PRIORITY</constant>) to VLAN header
461-
PCP field for outgoing frames. Takes a whitespace-separated list of unsigned integer pairs in the format
462-
<literal>from</literal>-<literal>to</literal>, e.g., <literal>21-7 45-5</literal> ranges 1–4294967294.
463-
Note that <literal>from</literal> must be greater than or equal to <literal>to</literal>. When unset,
464-
the kernel's default will be used.
465-
</para>
466-
</listitem>
467-
</varlistentry>
468-
<varlistentry>
469459
<term><varname>IngressQOSMaps=</varname></term>
470460
<listitem>
471-
<para>Defines a mapping of Linux internal packet priority (<constant>SO_PRIORITY</constant>) to VLAN header
472-
PCP field for incoming frames. Takes a whitespace-separated list of unsigned integer pairs in the format
473-
<literal>from</literal>-<literal>to</literal>, e.g., <literal>21-7 45-5</literal> ranges 1–4294967294.
474-
Note that <literal>from</literal> must be greater than or equal to <literal>to</literal>. When unset,
475-
the kernel's default will be used.
476-
</para>
461+
<para>Defines a mapping of Linux internal packet priority (<constant>SO_PRIORITY</constant>)
462+
to VLAN header PCP field for outgoing and incoming frames, respectively. Takes a
463+
whitespace-separated list of integer pairs, where each integer must be in the range
464+
1…4294967294, in the format <literal>from</literal>-<literal>to</literal>, e.g.,
465+
<literal>21-7 45-5</literal>. Note that <literal>from</literal> must be greater than or equal
466+
to <literal>to</literal>. When unset, the kernel's default will be used.</para>
477467
</listitem>
478468
</varlistentry>
479469
</variablelist>
@@ -1230,7 +1220,7 @@
12301220
value of zero means that a packet carrying that option may not enter
12311221
another tunnel before exiting the current tunnel.
12321222
(see <ulink url="https://tools.ietf.org/html/rfc2473#section-4.1.1"> RFC 2473</ulink>).
1233-
The valid range is 0–255 and <literal>none</literal>. Defaults to 4.
1223+
The valid range is 0…255 and <literal>none</literal>. Defaults to 4.
12341224
</para>
12351225
</listitem>
12361226
</varlistentry>
@@ -1769,7 +1759,7 @@
17691759
<listitem>
17701760
<para>Specifies the delay before a link is enabled after a
17711761
link up status has been detected. This value is rounded down
1772-
to a multiple of MIIMonitorSec. The default value is
1762+
to a multiple of <varname>MIIMonitorSec=</varname>. The default value is
17731763
0.</para>
17741764
</listitem>
17751765
</varlistentry>
@@ -1779,7 +1769,7 @@
17791769
<listitem>
17801770
<para>Specifies the delay before a link is disabled after a
17811771
link down status has been detected. This value is rounded
1782-
down to a multiple of MIIMonitorSec. The default value is
1772+
down to a multiple of <varname>MIIMonitorSec=</varname>. The default value is
17831773
0.</para>
17841774
</listitem>
17851775
</varlistentry>
@@ -1789,7 +1779,7 @@
17891779
<listitem>
17901780
<para>Specifies the number of seconds between instances where the bonding
17911781
driver sends learning packets to each slave peer switch.
1792-
The valid range is 1–0x7fffffff; the default value is 1. This option
1782+
The valid range is 1…0x7fffffff; the default value is 1. This option
17931783
has an effect only for the balance-tlb and balance-alb modes.</para>
17941784
</listitem>
17951785
</varlistentry>
@@ -1870,8 +1860,8 @@
18701860
<term><varname>ARPIPTargets=</varname></term>
18711861
<listitem>
18721862
<para>Specifies the IP addresses to use as ARP monitoring peers when
1873-
ARPIntervalSec is greater than 0. These are the targets of the ARP request
1874-
sent to determine the health of the link to the targets.
1863+
<varname>ARPIntervalSec=</varname> is greater than 0. These are the targets of the ARP
1864+
request sent to determine the health of the link to the targets.
18751865
Specify these values in IPv4 dotted decimal format. At least one IP
18761866
address must be given for ARP monitoring to function. The
18771867
maximum number of targets that can be specified is 16. The
@@ -1883,7 +1873,7 @@
18831873
<varlistentry>
18841874
<term><varname>ARPAllTargets=</varname></term>
18851875
<listitem>
1886-
<para>Specifies the quantity of ARPIPTargets that must be reachable
1876+
<para>Specifies the quantity of <varname>ARPIPTargets=</varname> that must be reachable
18871877
in order for the ARP monitor to consider a slave as being up.
18881878
This option affects only active-backup mode for slaves with
18891879
ARPValidate enabled. Possible values are
@@ -1914,7 +1904,7 @@
19141904
<para>Specifies the number of IGMP membership reports to be issued after
19151905
a failover event. One membership report is issued immediately after
19161906
the failover, subsequent packets are sent in each 200ms interval.
1917-
The valid range is 0–255. Defaults to 1. A value of 0
1907+
The valid range is 0…255. Defaults to 1. A value of 0
19181908
prevents the IGMP membership report from being issued in response
19191909
to the failover event.
19201910
</para>
@@ -1926,7 +1916,7 @@
19261916
<listitem>
19271917
<para>Specify the number of packets to transmit through a slave before
19281918
moving to the next one. When set to 0, then a slave is chosen at
1929-
random. The valid range is 0–65535. Defaults to 1. This option
1919+
random. The valid range is 0…65535. Defaults to 1. This option
19301920
only has effect when in balance-rr mode.
19311921
</para>
19321922
</listitem>
@@ -1941,7 +1931,7 @@
19411931
a peer notification is sent on the bonding device and each
19421932
VLAN sub-device. This is repeated at each link monitor interval
19431933
(ARPIntervalSec or MIIMonitorSec, whichever is active) if the number is
1944-
greater than 1. The valid range is 0–255. The default value is 1.
1934+
greater than 1. The valid range is 0…255. The default value is 1.
19451935
These options affect only the active-backup mode.
19461936
</para>
19471937
</listitem>

0 commit comments

Comments
 (0)