X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fnetwork%2Fnetworkd-netdev-gperf.gperf;h=9125e1db4e0977b885c52babb71304af7ff78fe6;hb=0372cb2bd2342fa5c5585c666f79159a8341f4a6;hp=cdaacb18ae191b793920fbfdfab4b25f4c648691;hpb=c0dda18697e0994272c0c9616d36f6777b60e2c7;p=elogind.git

diff --git a/src/network/networkd-netdev-gperf.gperf b/src/network/networkd-netdev-gperf.gperf
index cdaacb18a..9125e1db4 100644
--- a/src/network/networkd-netdev-gperf.gperf
+++ b/src/network/networkd-netdev-gperf.gperf
@@ -2,7 +2,7 @@
 #include <stddef.h>
 #include "conf-parser.h"
 #include "networkd.h"
-#include "net-util.h"
+#include "network-internal.h"
 %}
 struct ConfigPerfItem;
 %null_strings
@@ -15,10 +15,26 @@ struct ConfigPerfItem;
 %struct-type
 %includes
 %%
-Match.Host,              config_parse_net_condition,         CONDITION_HOST,                offsetof(NetDev, condition_host)
-Match.Virtualization,    config_parse_net_condition,         CONDITION_VIRTUALIZATION,      offsetof(NetDev, condition_virt)
-Match.KernelCommandLine, config_parse_net_condition,         CONDITION_KERNEL_COMMAND_LINE, offsetof(NetDev, condition_kernel)
+Match.Host,              config_parse_net_condition,         CONDITION_HOST,                offsetof(NetDev, match_host)
+Match.Virtualization,    config_parse_net_condition,         CONDITION_VIRTUALIZATION,      offsetof(NetDev, match_virt)
+Match.KernelCommandLine, config_parse_net_condition,         CONDITION_KERNEL_COMMAND_LINE, offsetof(NetDev, match_kernel)
+Match.Architecture,      config_parse_net_condition,         CONDITION_ARCHITECTURE,        offsetof(NetDev, match_arch)
 NetDev.Description,      config_parse_string,                0,                             offsetof(NetDev, description)
-NetDev.Name,             config_parse_ifname,                0,                             offsetof(NetDev, name)
+NetDev.Name,             config_parse_ifname,                0,                             offsetof(NetDev, ifname)
 NetDev.Kind,             config_parse_netdev_kind,           0,                             offsetof(NetDev, kind)
+NetDev.MTUBytes,         config_parse_iec_size,              0,                             offsetof(NetDev, mtu)
+NetDev.MACAddress,       config_parse_hwaddr,                0,                             offsetof(NetDev, mac)
 VLAN.Id,                 config_parse_uint64,                0,                             offsetof(NetDev, vlanid)
+MACVLAN.Mode,            config_parse_macvlan_mode,          0,                             offsetof(NetDev, macvlan_mode)
+Tunnel.Local,            config_parse_tunnel_address,        0,                             offsetof(NetDev, local)
+Tunnel.Remote,           config_parse_tunnel_address,        0,                             offsetof(NetDev, remote)
+Tunnel.TOS,              config_parse_unsigned,              0,                             offsetof(NetDev, tos)
+Tunnel.TTL,              config_parse_unsigned,              0,                             offsetof(NetDev, ttl)
+Tunnel.DiscoverPathMTU,  config_parse_bool,                  0,                             offsetof(NetDev, tunnel_pmtudisc)
+Peer.Name,               config_parse_ifname,                0,                             offsetof(NetDev, ifname_peer)
+Peer.MACAddress,         config_parse_hwaddr,                0,                             offsetof(NetDev, mac_peer)
+VXLAN.Id,                config_parse_uint64,                0,                             offsetof(NetDev, vxlanid)
+VXLAN.Group,             config_parse_tunnel_address,        0,                             offsetof(NetDev, group)
+VXLAN.TOS,               config_parse_unsigned,              0,                             offsetof(NetDev, tos)
+VXLAN.TTL,               config_parse_unsigned,              0,                             offsetof(NetDev, ttl)
+VXLAN.MacLearning,       config_parse_bool,                  0,                             offsetof(NetDev, learning)