summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Gundersen <teg@jklm.no>2015-02-14 00:32:56 +0100
committerTom Gundersen <teg@jklm.no>2015-02-14 00:32:56 +0100
commit60c35566600f45350c37f152c1093018972bd9a5 (patch)
treedaf4c6fe14f98dbd2c668006c6b846cfcb974f1b
parent56fd6bf795926409b087bce406ea851ad89f9fe8 (diff)
networkd: network - rename ipv6token parser
Too generic name.
-rw-r--r--src/network/networkd-network-gperf.gperf2
-rw-r--r--src/network/networkd-network.c2
-rw-r--r--src/network/networkd.h6
3 files changed, 5 insertions, 5 deletions
diff --git a/src/network/networkd-network-gperf.gperf b/src/network/networkd-network-gperf.gperf
index 2aa30a2b09..fc277df949 100644
--- a/src/network/networkd-network-gperf.gperf
+++ b/src/network/networkd-network-gperf.gperf
@@ -38,7 +38,7 @@ Network.DHCP, config_parse_dhcp, 0,
Network.DHCPServer, config_parse_bool, 0, offsetof(Network, dhcp_server)
Network.LinkLocalAddressing, config_parse_address_family_boolean,0, offsetof(Network, link_local)
Network.IPv4LLRoute, config_parse_bool, 0, offsetof(Network, ipv4ll_route)
-Network.IPv6Token, config_parse_token, 0, offsetof(Network, ipv6_token)
+Network.IPv6Token, config_parse_ipv6token, 0, offsetof(Network, ipv6_token)
Network.LLDP, config_parse_bool, 0, offsetof(Network, lldp)
Network.Address, config_parse_address, 0, 0
Network.Gateway, config_parse_gateway, 0, 0
diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c
index c90f730f10..35ac064cf6 100644
--- a/src/network/networkd-network.c
+++ b/src/network/networkd-network.c
@@ -651,7 +651,7 @@ int config_parse_llmnr(
return 0;
}
-int config_parse_token(
+int config_parse_ipv6token(
const char* unit,
const char *filename,
unsigned line,
diff --git a/src/network/networkd.h b/src/network/networkd.h
index 7f1f06c811..bdb2f20e2f 100644
--- a/src/network/networkd.h
+++ b/src/network/networkd.h
@@ -411,9 +411,9 @@ int config_parse_ipv4ll(const char *unit, const char *filename, unsigned line,
int ltype, const char *rvalue, void *data, void *userdata);
/* IPv6 support */
-int config_parse_token(const char *unit, const char *filename, unsigned line,
- const char *section, unsigned section_line, const char *lvalue,
- int ltype, const char *rvalue, void *data, void *userdata);
+int config_parse_ipv6token(const char *unit, const char *filename, unsigned line,
+ const char *section, unsigned section_line, const char *lvalue,
+ int ltype, const char *rvalue, void *data, void *userdata);
/* LLMNR support */