X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=src%2Fudev%2Fnet%2Flink-config-gperf.gperf;h=950fb15286faf024f13b7bc39d001d4b0dc42695;hb=d2df0d0ed3a88e491405b403e6022e6619750130;hp=1d905319e9395dabf7aec69f33028a149729f910;hpb=16b9b87aeee9353b5b8dae6089a69752422a5b09;p=elogind.git

diff --git a/src/udev/net/link-config-gperf.gperf b/src/udev/net/link-config-gperf.gperf
index 1d905319e..950fb1528 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 "net-util.h"
 #include "link-config.h"
+#include "ethtool-util.h"
 %}
 struct ConfigPerfItem;
 %null_strings
@@ -14,16 +16,17 @@ struct ConfigPerfItem;
 %struct-type
 %includes
 %%
-Match.MACAddress,                   config_parse_string,        0, offsetof(link_config, match_mac)
+Match.MACAddress,                   config_parse_hwaddr,        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.MACAddressPolicy,              config_parse_string,        0, offsetof(link_config, mac_policy)
-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.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.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)
+Link.Duplex,                        config_parse_duplex,        0, offsetof(link_config, duplex)
+Link.WakeOnLan,                     config_parse_wol,           0, offsetof(link_config, wol)