summaryrefslogtreecommitdiff
path: root/src/udev/net
diff options
context:
space:
mode:
authorYu Watanabe <watanabe.yu+github@gmail.com>2020-01-21 20:06:40 +0900
committerLennart Poettering <lennart@poettering.net>2020-01-21 16:51:19 +0100
commit502991215726347b2b3b0dfcee29c66e4038c888 (patch)
tree046141f5eddbf6fe6b030a5150963c36c4ee8245 /src/udev/net
parentce96c9cb1a8f81ff4bbc40f5a98d003d6ffacb57 (diff)
downloadsystemd-502991215726347b2b3b0dfcee29c66e4038c888.tar.gz
network,udev: use uint64_t for bit rate
Fixes #14620.
Diffstat (limited to 'src/udev/net')
-rw-r--r--src/udev/net/link-config-gperf.gperf2
-rw-r--r--src/udev/net/link-config.c3
-rw-r--r--src/udev/net/link-config.h2
3 files changed, 2 insertions, 5 deletions
diff --git a/src/udev/net/link-config-gperf.gperf b/src/udev/net/link-config-gperf.gperf
index 686ff1bc5c..1e794efdcb 100644
--- a/src/udev/net/link-config-gperf.gperf
+++ b/src/udev/net/link-config-gperf.gperf
@@ -40,7 +40,7 @@ Link.AlternativeName, config_parse_ifnames, 1,
Link.AlternativeNamesPolicy, config_parse_alternative_names_policy, 0, offsetof(link_config, alternative_names_policy)
Link.Alias, config_parse_ifalias, 0, offsetof(link_config, alias)
Link.MTUBytes, config_parse_mtu, AF_UNSPEC, offsetof(link_config, mtu)
-Link.BitsPerSecond, config_parse_si_size, 0, offsetof(link_config, speed)
+Link.BitsPerSecond, config_parse_si_uint64, 0, offsetof(link_config, speed)
Link.Duplex, config_parse_duplex, 0, offsetof(link_config, duplex)
Link.AutoNegotiation, config_parse_tristate, 0, offsetof(link_config, autonegotiation)
Link.WakeOnLan, config_parse_wol, 0, offsetof(link_config, wol)
diff --git a/src/udev/net/link-config.c b/src/udev/net/link-config.c
index 4a44edfc01..e1a25a54a6 100644
--- a/src/udev/net/link-config.c
+++ b/src/udev/net/link-config.c
@@ -160,9 +160,6 @@ int link_load_one(link_config_ctx *ctx, const char *filename) {
if (r < 0)
return r;
- if (link->speed > UINT_MAX)
- return -ERANGE;
-
if (set_isempty(link->match_mac) && set_isempty(link->match_permanent_mac) &&
strv_isempty(link->match_path) && strv_isempty(link->match_driver) && strv_isempty(link->match_type) &&
strv_isempty(link->match_name) && strv_isempty(link->match_property) && !link->conditions)
diff --git a/src/udev/net/link-config.h b/src/udev/net/link-config.h
index 496a8bccb7..a85bd4b46b 100644
--- a/src/udev/net/link-config.h
+++ b/src/udev/net/link-config.h
@@ -53,7 +53,7 @@ struct link_config {
char **alternative_names;
char *alias;
uint32_t mtu;
- size_t speed;
+ uint64_t speed;
Duplex duplex;
int autonegotiation;
uint32_t advertise[N_ADVERTISE];