summaryrefslogtreecommitdiff
path: root/src/network/networkd-network-gperf.gperf
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2017-01-12 10:19:30 +0100
committerGitHub <noreply@github.com>2017-01-12 10:19:30 +0100
commite843b04ee95815e862d9d4399ca99680b2b6f6ea (patch)
tree10a07ca608f7d7678a35b322f45584169877e98a /src/network/networkd-network-gperf.gperf
parentfb1baf9218c12d634e82faaa0ca6cc1b2ac5fc13 (diff)
parent9a4bf1e8d311513167dc5b456a243d78c52976fb (diff)
Merge pull request #5069 from keszybz/fixlets
Small fixes and enhancements to docs and code
Diffstat (limited to 'src/network/networkd-network-gperf.gperf')
-rw-r--r--src/network/networkd-network-gperf.gperf7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/network/networkd-network-gperf.gperf b/src/network/networkd-network-gperf.gperf
index 862cfad1ff..7b54e81fb8 100644
--- a/src/network/networkd-network-gperf.gperf
+++ b/src/network/networkd-network-gperf.gperf
@@ -60,14 +60,13 @@ Network.IPForward, config_parse_address_family_boolean_with
Network.IPMasquerade, config_parse_bool, 0, offsetof(Network, ip_masquerade)
Network.IPv6PrivacyExtensions, config_parse_ipv6_privacy_extensions, 0, offsetof(Network, ipv6_privacy_extensions)
Network.IPv6AcceptRA, config_parse_tristate, 0, offsetof(Network, ipv6_accept_ra)
-Network.ActiveSlave, config_parse_bool, 0, offsetof(Network, active_slave)
-Network.PrimarySlave, config_parse_bool, 0, offsetof(Network, primary_slave)
-/* legacy alias for the above */
Network.IPv6AcceptRouterAdvertisements, config_parse_tristate, 0, offsetof(Network, ipv6_accept_ra)
Network.IPv6DuplicateAddressDetection, config_parse_int, 0, offsetof(Network, ipv6_dad_transmits)
Network.IPv6HopLimit, config_parse_int, 0, offsetof(Network, ipv6_hop_limit)
-Network.ProxyARP, config_parse_tristate, 0, offsetof(Network, proxy_arp)
+Network.ActiveSlave, config_parse_bool, 0, offsetof(Network, active_slave)
+Network.PrimarySlave, config_parse_bool, 0, offsetof(Network, primary_slave)
Network.IPv4ProxyARP, config_parse_tristate, 0, offsetof(Network, proxy_arp)
+Network.ProxyARP, config_parse_tristate, 0, offsetof(Network, proxy_arp)
Network.BindCarrier, config_parse_strv, 0, offsetof(Network, bind_carrier)
Address.Address, config_parse_address, 0, 0
Address.Peer, config_parse_address, 0, 0