From f3fa44cb8ed327a2d8f012bff795318a54bc6f99 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Mon, 6 Dec 2021 16:51:57 +0900 Subject: [PATCH 1/3] man: netdev: use tag --- man/systemd.netdev.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/man/systemd.netdev.xml b/man/systemd.netdev.xml index 255b85f404..eb6a3e901e 100644 --- a/man/systemd.netdev.xml +++ b/man/systemd.netdev.xml @@ -1769,7 +1769,7 @@ Specifies the delay before a link is enabled after a link up status has been detected. This value is rounded down - to a multiple of MIIMonitorSec. The default value is + to a multiple of MIIMonitorSec=. The default value is 0. @@ -1779,7 +1779,7 @@ Specifies the delay before a link is disabled after a 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 MIIMonitorSec=. The default value is 0. @@ -1870,8 +1870,8 @@ ARPIPTargets= Specifies the IP addresses to use as ARP monitoring peers when - ARPIntervalSec is greater than 0. These are the targets of the ARP request - sent to determine the health of the link to the targets. + ARPIntervalSec= is greater than 0. These are the targets of the ARP + request sent to determine the health of the link to the targets. Specify these values in IPv4 dotted decimal format. At least one IP address must be given for ARP monitoring to function. The maximum number of targets that can be specified is 16. The @@ -1883,7 +1883,7 @@ ARPAllTargets= - Specifies the quantity of ARPIPTargets that must be reachable + Specifies the quantity of ARPIPTargets= that must be reachable in order for the ARP monitor to consider a slave as being up. This option affects only active-backup mode for slaves with ARPValidate enabled. Possible values are From 9b65490f3f09ba10476a75689962575f2d4565ca Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Mon, 6 Dec 2021 16:53:35 +0900 Subject: [PATCH 2/3] =?UTF-8?q?man:=20netdev:=20use=20=E2=80=A6=20to=20spe?= =?UTF-8?q?cify=20range?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- man/systemd.netdev.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/man/systemd.netdev.xml b/man/systemd.netdev.xml index eb6a3e901e..8f102b16cf 100644 --- a/man/systemd.netdev.xml +++ b/man/systemd.netdev.xml @@ -459,7 +459,7 @@ Defines a mapping of Linux internal packet priority (SO_PRIORITY) to VLAN header PCP field for outgoing frames. Takes a whitespace-separated list of unsigned integer pairs in the format - from-to, e.g., 21-7 45-5 ranges 1–4294967294. + from-to, e.g., 21-7 45-5 ranges 1…4294967294. Note that from must be greater than or equal to to. When unset, the kernel's default will be used. @@ -470,7 +470,7 @@ Defines a mapping of Linux internal packet priority (SO_PRIORITY) to VLAN header PCP field for incoming frames. Takes a whitespace-separated list of unsigned integer pairs in the format - from-to, e.g., 21-7 45-5 ranges 1–4294967294. + from-to, e.g., 21-7 45-5 ranges 1…4294967294. Note that from must be greater than or equal to to. When unset, the kernel's default will be used. @@ -1230,7 +1230,7 @@ value of zero means that a packet carrying that option may not enter another tunnel before exiting the current tunnel. (see RFC 2473). - The valid range is 0–255 and none. Defaults to 4. + The valid range is 0…255 and none. Defaults to 4. @@ -1789,7 +1789,7 @@ Specifies the number of seconds between instances where the bonding driver sends learning packets to each slave peer switch. - The valid range is 1–0x7fffffff; the default value is 1. This option + The valid range is 1…0x7fffffff; the default value is 1. This option has an effect only for the balance-tlb and balance-alb modes. @@ -1914,7 +1914,7 @@ Specifies the number of IGMP membership reports to be issued after a failover event. One membership report is issued immediately after the failover, subsequent packets are sent in each 200ms interval. - The valid range is 0–255. Defaults to 1. A value of 0 + The valid range is 0…255. Defaults to 1. A value of 0 prevents the IGMP membership report from being issued in response to the failover event. @@ -1926,7 +1926,7 @@ 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 only has effect when in balance-rr mode. @@ -1941,7 +1941,7 @@ a peer notification is sent on the bonding device and each VLAN sub-device. This is repeated at each link monitor interval (ARPIntervalSec or MIIMonitorSec, whichever is active) if the number is - greater than 1. The valid range is 0–255. The default value is 1. + greater than 1. The valid range is 0…255. The default value is 1. These options affect only the active-backup mode. From ee44b32ff4dbea6a34ac330d5aa02e660c316f62 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Mon, 6 Dec 2021 17:59:35 +0900 Subject: [PATCH 3/3] man: netdev: merge and reword Egress/IngressQOSMAps= --- man/systemd.netdev.xml | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/man/systemd.netdev.xml b/man/systemd.netdev.xml index 8f102b16cf..0aec58fc81 100644 --- a/man/systemd.netdev.xml +++ b/man/systemd.netdev.xml @@ -456,24 +456,14 @@ EgressQOSMaps= - - Defines a mapping of Linux internal packet priority (SO_PRIORITY) to VLAN header - PCP field for outgoing frames. Takes a whitespace-separated list of unsigned integer pairs in the format - from-to, e.g., 21-7 45-5 ranges 1…4294967294. - Note that from must be greater than or equal to to. When unset, - the kernel's default will be used. - - - - IngressQOSMaps= - Defines a mapping of Linux internal packet priority (SO_PRIORITY) to VLAN header - PCP field for incoming frames. Takes a whitespace-separated list of unsigned integer pairs in the format - from-to, e.g., 21-7 45-5 ranges 1…4294967294. - Note that from must be greater than or equal to to. When unset, - the kernel's default will be used. - + Defines a mapping of Linux internal packet priority (SO_PRIORITY) + to VLAN header PCP field for outgoing and incoming frames, respectively. Takes a + whitespace-separated list of integer pairs, where each integer must be in the range + 1…4294967294, in the format from-to, e.g., + 21-7 45-5. Note that from must be greater than or equal + to to. When unset, the kernel's default will be used.