X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fudev%2Fnet%2Flink-config-gperf.gperf;h=191ab68fa1ea5864fe714be1aa86138af89519a4;hb=6cb8e687f038424ef54b5c5c3c433be974fbe371;hp=b38dbe80bdaebc1f20c5898a7dadbf1eecd63548;hpb=daeb71a36a98834664e4d95773a3629b746f4db8;p=elogind.git

diff --git a/src/udev/net/link-config-gperf.gperf b/src/udev/net/link-config-gperf.gperf
index b38dbe80b..191ab68fa 100644
--- a/src/udev/net/link-config-gperf.gperf
+++ b/src/udev/net/link-config-gperf.gperf
@@ -1,7 +1,9 @@
 %{
 #include <stddef.h>
 #include "conf-parser.h"
+#include "network-internal.h"
 #include "link-config.h"
+#include "ethtool-util.h"
 %}
 struct ConfigPerfItem;
 %null_strings
@@ -14,15 +16,22 @@ struct ConfigPerfItem;
 %struct-type
 %includes
 %%
-Match.MACAddress,                   config_parse_string,        0, offsetof(link_config, match_mac)
-Match.Path,                         config_parse_string,        0, offsetof(link_config, match_path)
-Match.Driver,                       config_parse_string,        0, offsetof(link_config, match_driver)
-Match.Type,                         config_parse_string,        0, offsetof(link_config, match_type)
-Link.Description,                   config_parse_string,        0, offsetof(link_config, description)
-Link.MACAddress,                    config_parse_string,        0, offsetof(link_config, mac)
-Link.NamePolicy,                    config_parse_strv,          0, offsetof(link_config, name_policy)
-Link.Name,                          config_parse_string,        0, offsetof(link_config, name)
-Link.MTU,                           config_parse_unsigned,      0, offsetof(link_config, mtu)
-Link.SpeedMBytes,                   config_parse_unsigned,      0, offsetof(link_config, speed)
-Link.Duplex,                        config_parse_string,        0, offsetof(link_config, duplex)
-Link.WakeOnLan,                     config_parse_string,        0, offsetof(link_config, wol)
+Match.MACAddress,          config_parse_hwaddr,        0,                             offsetof(link_config, match_mac)
+Match.OriginalName,        config_parse_ifname,        0,                             offsetof(link_config, match_name)
+Match.Path,                config_parse_string,        0,                             offsetof(link_config, match_path)
+Match.Driver,              config_parse_string,        0,                             offsetof(link_config, match_driver)
+Match.Type,                config_parse_string,        0,                             offsetof(link_config, match_type)
+Match.Host,                config_parse_net_condition, CONDITION_HOST,                offsetof(link_config, match_host)
+Match.Virtualization,      config_parse_net_condition, CONDITION_VIRTUALIZATION,      offsetof(link_config, match_virt)
+Match.KernelCommandLine,   config_parse_net_condition, CONDITION_KERNEL_COMMAND_LINE, offsetof(link_config, match_kernel)
+Match.Architecture,        config_parse_net_condition, CONDITION_ARCHITECTURE,        offsetof(link_config, match_arch)
+Link.Description,          config_parse_string,        0,                             offsetof(link_config, description)
+Link.MACAddressPolicy,     config_parse_mac_policy,    0,                             offsetof(link_config, mac_policy)
+Link.MACAddress,           config_parse_hwaddr,        0,                             offsetof(link_config, mac)
+Link.NamePolicy,           config_parse_name_policy,   0,                             offsetof(link_config, name_policy)
+Link.Name,                 config_parse_ifname,        0,                             offsetof(link_config, name)
+Link.Alias,                config_parse_ifalias,       0,                             offsetof(link_config, alias)
+Link.MTUBytes,             config_parse_iec_size,      0,                             offsetof(link_config, mtu)
+Link.BitsPerSecond,        config_parse_si_size,       0,                             offsetof(link_config, speed)
+Link.Duplex,               config_parse_duplex,        0,                             offsetof(link_config, duplex)
+Link.WakeOnLan,            config_parse_wol,           0,                             offsetof(link_config, wol)