diff options
author | Tom Gundersen <teg@jklm.no> | 2014-08-13 22:55:49 +0200 |
---|---|---|
committer | Tom Gundersen <teg@jklm.no> | 2014-08-13 22:55:49 +0200 |
commit | 438ca2bbd4dc1de6193ec61f3c12e19cded7921d (patch) | |
tree | a90c3791fd4a9d231616d6f6ee93f36f3a1b47f0 | |
parent | d3df0e3982777fd5de8cffaa585eba0af3773c08 (diff) |
sd-networkd: rename link_get_state to link_get_setup_state
Suggested by Kay and Lennart.
-rw-r--r-- | src/libsystemd/sd-network/sd-network.c | 2 | ||||
-rw-r--r-- | src/network/networkctl.c | 4 | ||||
-rw-r--r-- | src/network/networkd-wait-online-link.c | 2 | ||||
-rw-r--r-- | src/systemd/sd-network.h | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/libsystemd/sd-network/sd-network.c b/src/libsystemd/sd-network/sd-network.c index f8f48b0ddf..97d041ae7f 100644 --- a/src/libsystemd/sd-network/sd-network.c +++ b/src/libsystemd/sd-network/sd-network.c @@ -92,7 +92,7 @@ _public_ int sd_network_get_ntp(char ***ret) { return network_get_strv("NTP", ret); } -_public_ int sd_network_link_get_state(int ifindex, char **state) { +_public_ int sd_network_link_get_setup_state(int ifindex, char **state) { _cleanup_free_ char *s = NULL, *p = NULL; int r; diff --git a/src/network/networkctl.c b/src/network/networkctl.c index 6fb9e62775..f83c1f3f9f 100644 --- a/src/network/networkctl.c +++ b/src/network/networkctl.c @@ -198,7 +198,7 @@ static int list_links(char **args, unsigned n) { char devid[2 + DECIMAL_STR_MAX(int)]; _cleanup_free_ char *t = NULL; - sd_network_link_get_state(links[i].ifindex, &state); + sd_network_link_get_setup_state(links[i].ifindex, &state); sd_network_link_get_operational_state(links[i].ifindex, &operational_state); sprintf(devid, "n%i", links[i].ifindex); @@ -340,7 +340,7 @@ static int link_status_one(sd_rtnl *rtnl, struct udev *udev, const char *name) { sd_rtnl_message_read_u32(reply, IFLA_MTU, &mtu); - sd_network_link_get_state(ifindex, &state); + sd_network_link_get_setup_state(ifindex, &state); sd_network_link_get_operational_state(ifindex, &operational_state); sd_network_link_get_dns(ifindex, &dns); diff --git a/src/network/networkd-wait-online-link.c b/src/network/networkd-wait-online-link.c index 1670beefab..f23c7ceb80 100644 --- a/src/network/networkd-wait-online-link.c +++ b/src/network/networkd-wait-online-link.c @@ -131,7 +131,7 @@ int link_update_monitor(Link *l) { free(l->state); l->state = NULL; - sd_network_link_get_state(l->ifindex, &l->state); + sd_network_link_get_setup_state(l->ifindex, &l->state); return 0; } diff --git a/src/systemd/sd-network.h b/src/systemd/sd-network.h index dede7aea3d..47731c2620 100644 --- a/src/systemd/sd-network.h +++ b/src/systemd/sd-network.h @@ -64,7 +64,7 @@ int sd_network_get_dns(char ***addr); * reperesentations of IP addresses */ int sd_network_get_ntp(char ***addr); -/* Get state from ifindex. +/* Get setup state from ifindex. * Possible states: * pending: udev is still processing the link, we don't yet know if we will manage it * failed: networkd failed to manage the link @@ -75,7 +75,7 @@ int sd_network_get_ntp(char ***addr); * Possible return codes: * -ENODATA: networkd is not aware of the link */ -int sd_network_link_get_state(int ifindex, char **state); +int sd_network_link_get_setup_state(int ifindex, char **state); /* Get operatinal state from ifindex. * Possible states: |