diff --git a/NEWS b/NEWS
index 5ed27af30c..3eae7078e3 100644
--- a/NEWS
+++ b/NEWS
@@ -5613,7 +5613,7 @@ CHANGES WITH 250:
IP addresses outside of the configured IP pool range for the server.
* CAN support in systemd-networkd gained four new settings Loopback=,
- OneShot=, PresumeAck=, ClassicDataLengthCode= for tweaking CAN
+ OneShot=, PresumeACK=, ClassicDataLengthCode= for tweaking CAN
control modes. It gained a number of further settings for tweaking
CAN timing quanta.
diff --git a/man/systemd.netdev.xml b/man/systemd.netdev.xml
index b809bd220e..b88c51b90e 100644
--- a/man/systemd.netdev.xml
+++ b/man/systemd.netdev.xml
@@ -1058,7 +1058,7 @@
TunnelId=
- Specifies the tunnel identifier. Takes an number in the range 1…4294967295. The value used
+ Specifies the tunnel identifier. Takes a number in the range 1…4294967295. The value used
must match the PeerTunnelId= value being used at the peer. This setting is
compulsory.
@@ -1136,7 +1136,7 @@
- UDP6ZeroChecksumTx=
+ UDP6ChecksumTx=
Takes a boolean. When true, skip UDP checksum calculation for transmitted packets over IPv6.
@@ -1144,7 +1144,7 @@
- UDP6ZeroChecksumRx=
+ UDP6ChecksumRx=
Takes a boolean. When true, allows incoming UDP packets over IPv6 with zero checksum field.
@@ -1172,7 +1172,7 @@
SessionId=
- Specifies the session identifier. Takes an number in the range 1…4294967295. The value used
+ Specifies the session identifier. Takes a number in the range 1…4294967295. The value used
must match the SessionId= value being used at the peer. This setting is
compulsory.
@@ -1182,7 +1182,7 @@
PeerSessionId=
- Specifies the peer session identifier. Takes an number in the range 1…4294967295.
+ Specifies the peer session identifier. Takes a number in the range 1…4294967295.
The value used must match the PeerSessionId= value being used at the peer.
This setting is compulsory.
@@ -1717,7 +1717,7 @@
ERSPANHardwareId=
- Specifies an unique identifier of the ERSPAN v2 engine. Takes an integer in the range 0…63.
+ Specifies a unique identifier of the ERSPAN v2 engine. Takes an integer in the range 0…63.
Only used when ERSPANVersion=2. Defaults to 0.
@@ -2467,7 +2467,7 @@
Takes a boolean. Specifies that duplicate frames (received on inactive ports)
should be dropped when false, or delivered when true. Normally, bonding will drop
duplicate frames (received on inactive ports), which is desirable for
- most users. But there are some times it is nice to allow duplicate
+ most users. But there are some cases where it is nice to allow duplicate
frames to be delivered. The default value is false (drop duplicate frames
received on inactive ports).
@@ -2724,9 +2724,9 @@
- IgnoreUserspaceMulticastGroup=
+ IgnoreUserspaceMulticastGroups=
- Takes an boolean value. When true, the kernel ignores multicast groups handled by
+ Takes a boolean value. When true, the kernel ignores multicast groups handled by
userspace. Defaults to unset, and the kernel's default is used.
diff --git a/man/systemd.network.xml b/man/systemd.network.xml
index a10a4616d0..c1618c0f94 100644
--- a/man/systemd.network.xml
+++ b/man/systemd.network.xml
@@ -884,7 +884,7 @@ DuplicateAddressDetection=none
IPMasquerade=
Configures IP masquerading for the network interface. If enabled, packets forwarded
- from the network interface will be appear as coming from the local host. Typically, this should be
+ from the network interface will appear as coming from the local host. Typically, this should be
enabled on the downstream interface of routers. Takes one of ipv4,
ipv6, both, or no. Defaults to
no. Note that any positive boolean values such as yes or
@@ -1359,7 +1359,7 @@ DuplicateAddressDetection=none
inet_pton3.
If set to true, then the IPv4 broadcast address will be derived from the
Address= setting. If set to false, then the broadcast address will not be
- set. Defaults to true, except for wireguard interfaces, where it default to false.
+ set. Defaults to true, except for wireguard interfaces, where it defaults to false.
@@ -4932,7 +4932,7 @@ ServerAddress=192.168.0.1/24
- PresumeAck=
+ PresumeACK=
Takes a boolean. When yes, the interface will ignore missing CAN
ACKs. When unset, the kernel's default will be used.
diff --git a/src/network/netdev/netdev-gperf.gperf b/src/network/netdev/netdev-gperf.gperf
index dcd786d87f..612f463e33 100644
--- a/src/network/netdev/netdev-gperf.gperf
+++ b/src/network/netdev/netdev-gperf.gperf
@@ -113,9 +113,12 @@ L2TP.UDPDestinationPort, config_parse_ip_port,
L2TP.Local, config_parse_l2tp_tunnel_local_address, 0, 0
L2TP.Remote, config_parse_l2tp_tunnel_remote_address, 0, 0
L2TP.EncapsulationType, config_parse_l2tp_encap_type, 0, offsetof(L2tpTunnel, l2tp_encap_type)
-L2TP.UDPCheckSum, config_parse_bool, 0, offsetof(L2tpTunnel, udp_csum)
-L2TP.UDP6CheckSumRx, config_parse_bool, 0, offsetof(L2tpTunnel, udp6_csum_rx)
-L2TP.UDP6CheckSumTx, config_parse_bool, 0, offsetof(L2tpTunnel, udp6_csum_tx)
+L2TP.UDPChecksum, config_parse_bool, 0, offsetof(L2tpTunnel, udp_csum)
+L2TP.UDPCheckSum, config_parse_bool, 0, offsetof(L2tpTunnel, udp_csum) /* deprecated */
+L2TP.UDP6ChecksumRx, config_parse_bool, 0, offsetof(L2tpTunnel, udp6_csum_rx)
+L2TP.UDP6CheckSumRx, config_parse_bool, 0, offsetof(L2tpTunnel, udp6_csum_rx) /* deprecated */
+L2TP.UDP6ChecksumTx, config_parse_bool, 0, offsetof(L2tpTunnel, udp6_csum_tx)
+L2TP.UDP6CheckSumTx, config_parse_bool, 0, offsetof(L2tpTunnel, udp6_csum_tx) /* deprecated */
L2TPSession.SessionId, config_parse_l2tp_session_id, 0, 0
L2TPSession.PeerSessionId, config_parse_l2tp_session_id, 0, 0
L2TPSession.Layer2SpecificHeader, config_parse_l2tp_session_l2spec, 0, 0
diff --git a/test/test-network/conf/25-l2tp-udp.netdev b/test/test-network/conf/25-l2tp-udp.netdev
index 79824df5d4..4adbf6ab59 100644
--- a/test/test-network/conf/25-l2tp-udp.netdev
+++ b/test/test-network/conf/25-l2tp-udp.netdev
@@ -12,8 +12,8 @@ Local=static@test1
Remote=192.168.30.101
EncapsulationType=udp
UDPCheckSum=true
-UDP6CheckSumRx=true
-UDP6CheckSumTx=true
+UDP6ChecksumRx=true
+UDP6ChecksumTx=true
[L2TPSession]
SessionId=15