diff --git a/man/systemd.network.xml b/man/systemd.network.xml
index 5307a508d3..1eb8274e83 100644
--- a/man/systemd.network.xml
+++ b/man/systemd.network.xml
@@ -810,17 +810,23 @@ IPv6Token=prefixstable:2002:da8:1::
- IPv6PrefixDelegation=
- Whether to enable or disable Router Advertisement sending on a link. Allowed
- values are static which distributes prefixes as defined in the
- [IPv6PrefixDelegation] and any [IPv6Prefix] sections, dhcpv6 which requests
- prefixes using a DHCPv6 client configured for another link and any values configured in the
- [IPv6PrefixDelegation] section while ignoring all static prefix configuration sections,
- yes which uses both static configuration and DHCPv6, and
- false which turns off IPv6 prefix delegation altogether. Defaults to
- false. See the [IPv6PrefixDelegation] and the [IPv6Prefix] sections for more
+ IPv6SendRA=
+ Whether to enable or disable Router Advertisement sending on a link. Takes a
+ boolean value. When enabled, prefixes configured in [IPv6Prefix] sections and routes
+ configured in [IPv6RoutePrefix] sections are distributed as defined in the [IPv6SendRA]
+ section. If DHCPv6PrefixDelegation= is enabled, then the delegated
+ prefixes are also distributed. See DHCPv6PrefixDelegation= setting and the
+ [IPv6SendRA], [IPv6Prefix], [IPv6RoutePrefix], and [DHCPv6PrefixDelegation] sections for more
configuration options.
+
+ DHCPv6PrefixDelegation=
+ Takes a boolean value. When enabled, requests prefixes using a DHCPv6 client
+ configured on another link. By default, an address within each delegated prefix will be
+ assigned, and the prefixes will be announced through IPv6 Router Advertisement when
+ IPv6SendRA= is enabled. Such default settings can be configured in
+ [DHCPv6PrefixDelegation] section.
+
IPv6MTUBytes=
Configures IPv6 maximum transmission unit (MTU).
@@ -1957,9 +1963,9 @@ IPv6Token=prefixstable:2002:da8:1::
[DHCPv6PrefixDelegation] Section Options
- The [DHCPv6PrefixDelegation] section configures delegated prefix assigned by DHCPv6 server.
- The settings in this section are used only when IPv6PrefixDelegation= setting is
- enabled, or set to dhcpv6.
+ The [DHCPv6PrefixDelegation] section configures delegated prefixes assigned by DHCPv6 server.
+ The settings in this section are used only when DHCPv6PrefixDelegation= setting
+ is enabled.
@@ -1969,9 +1975,16 @@ IPv6Token=prefixstable:2002:da8:1::
delegation. You can either set "auto" (the default) or a specific subnet ID (as defined in
RFC 4291, section
2.5.4), in which case the allowed value is hexadecimal, from 0 to 0x7fffffffffffffff
- inclusive. This option is only effective when used together with
- IPv6PrefixDelegation= and the corresponding configuration on the upstream
- interface.
+ inclusive.
+
+
+
+
+ Announce=
+
+ Takes a boolean. When enabled, and IPv6SendRA= in [Network] section
+ is enabled, the delegated prefixes are distributed through the IPv6 Router Advertisement.
+ Defaults to yes.
@@ -1979,19 +1992,22 @@ IPv6Token=prefixstable:2002:da8:1::
Assign=
Takes a boolean. Specifies whether to add an address from the delegated prefixes which
- are received from the WAN interface by the IPv6PrefixDelegation=. When
- true (on LAN interfce), the EUI-64 algorithm will be used to form an interface identifier
- from the delegated prefixes. Defaults to true.
+ are received from the WAN interface by the DHCPv6 Prefix Delegation. When true (on LAN
+ interfce), the EUI-64 algorithm will be used by default to form an interface identifier from
+ the delegated prefixes. See also Token= setting below. Defaults to yes.
+
Token=
- Specifies an optional address generation mode for Assign=. Takes an
- IPv6 address. When set, the lower bits of the supplied address are combined with the upper
- bits of a delegatad prefix received from the WAN interface by the
- IPv6PrefixDelegation= prefixes to form a complete address.
+ Specifies an optional address generation mode for assigning an address in each
+ delegated prefix. Takes an IPv6 address. When set, the lower bits of the supplied address is
+ combined with the upper bits of each delegatad prefix received from the WAN interface by the
+ DHCPv6 Prefix Delegation to form a complete address. When Assign= is
+ disabled, this setting is ignored. When unset, the EUI-64 algorithm will be used to form
+ addresses. Defaults to unset.
@@ -2213,10 +2229,11 @@ IPv6Token=prefixstable:2002:da8:1::
- [IPv6PrefixDelegation] Section Options
- The [IPv6PrefixDelegation] section contains settings for sending IPv6 Router Advertisements and
- whether to act as a router, if enabled via the IPv6PrefixDelegation= option described
- above. IPv6 network prefixes are defined with one or more [IPv6Prefix] sections.
+ [IPv6SendRA] Section Options
+ The [IPv6SendRA] section contains settings for sending IPv6 Router Advertisements and whether
+ to act as a router, if enabled via the IPv6SendRA= option described above. IPv6
+ network prefixes or routes are defined with one or more [IPv6Prefix] or [IPv6RoutePrefix] sections.
+
@@ -3586,10 +3603,13 @@ DHCP=ipv6
Name=enp2s0
[Network]
-IPv6PrefixDelegation=dhcpv6
+IPv6SendRA=yes
+DHCPv6PrefixDelegation=yes
- This will enable IPv6 PD on the interface enp1s0 as an upstream interface where the
- DHCPv6 client is running and enp2s0 as a downstream interface where the prefix is delegated to.
+ This will enable DHCPv6-PD on the interface enp1s0 as an upstream interface where the
+ DHCPv6 client is running and enp2s0 as a downstream interface where the prefix is delegated to.
+ The delegated prefixes are distributed by IPv6 Router Advertisement on the downstream network.
+