X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fnetwork%2Fnetworkd-netdev-gperf.gperf;h=090dfb35eba4e1a6aad7d184edcd7a16e391d66d;hb=eda8090ba9abc7d00f30e2b4cb34273cde799704;hp=82cc8583dc7e4f3f48e4098b616389ff7bdd413a;hpb=96c907429e3224289fd360b8d9c8fdc573f4363b;p=elogind.git

diff --git a/src/network/networkd-netdev-gperf.gperf b/src/network/networkd-netdev-gperf.gperf
index 82cc8583d..090dfb35e 100644
--- a/src/network/networkd-netdev-gperf.gperf
+++ b/src/network/networkd-netdev-gperf.gperf
@@ -1,7 +1,10 @@
 %{
 #include <stddef.h>
 #include "conf-parser.h"
-#include "networkd.h"
+#include "networkd-netdev.h"
+#include "networkd-netdev-tunnel.h"
+#include "networkd-netdev-bond.h"
+#include "networkd-netdev-macvlan.h"
 #include "network-internal.h"
 %}
 struct ConfigPerfItem;
@@ -26,10 +29,26 @@ NetDev.MTUBytes,         config_parse_iec_size,              0,
 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, tunnel_local)
-Tunnel.Remote,           config_parse_tunnel_address,        0,                             offsetof(NetDev, tunnel_remote)
-Tunnel.TOS,              config_parse_unsigned,              0,                             offsetof(NetDev, tunnel_tos)
-Tunnel.TTL,              config_parse_unsigned,              0,                             offsetof(NetDev, tunnel_ttl)
+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)
+Tun.OneQueue,            config_parse_bool,                  0,                             offsetof(NetDev, one_queue)
+Tun.MultiQueue,          config_parse_bool,                  0,                             offsetof(NetDev, multi_queue)
+Tun.PacketInfo,          config_parse_bool,                  0,                             offsetof(NetDev, packet_info)
+Tun.User,                config_parse_string,                0,                             offsetof(NetDev, user_name)
+Tun.Group,               config_parse_string,                0,                             offsetof(NetDev, group_name)
+Tap.OneQueue,            config_parse_bool,                  0,                             offsetof(NetDev, one_queue)
+Tap.MultiQueue,          config_parse_bool,                  0,                             offsetof(NetDev, multi_queue)
+Tap.PacketInfo,          config_parse_bool,                  0,                             offsetof(NetDev, packet_info)
+Tap.User,                config_parse_string,                0,                             offsetof(NetDev, user_name)
+Tap.Group,               config_parse_string,                0,                             offsetof(NetDev, group_name)
+Bond.Mode,               config_parse_bond_mode,             0,                             offsetof(NetDev, bond_mode)