diff options
| author | Tom Gundersen <teg@jklm.no> | 2015-10-16 17:34:58 +0200 |
|---|---|---|
| committer | Tom Gundersen <teg@jklm.no> | 2015-10-22 17:19:54 +0200 |
| commit | de1e9928f137f4d17f463956a7612d9676c393aa (patch) | |
| tree | 1bd8ee1c5170081e622024e86dc03712e0c23d3d /src/network/networkd-link.c | |
| parent | 4d7b83da7b78647f4ba3f1d6fa2dc8d7b9833d93 (diff) | |
networkd: rename icmp6 to ndisc
Diffstat (limited to 'src/network/networkd-link.c')
| -rw-r--r-- | src/network/networkd-link.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c index c46ab9b798..732a0c438d 100644 --- a/src/network/networkd-link.c +++ b/src/network/networkd-link.c @@ -370,7 +370,7 @@ static void link_free(Link *link) { sd_ipv4ll_unref(link->ipv4ll); sd_dhcp6_client_unref(link->dhcp6_client); - sd_ndisc_unref(link->icmp6_router_discovery); + sd_ndisc_unref(link->ndisc_router_discovery); if (link->manager) hashmap_remove(link->manager->links, INT_TO_PTR(link->ifindex)); @@ -481,14 +481,14 @@ static int link_stop_clients(Link *link) { r = log_link_warning_errno(link, r, "Could not stop IPv4 link-local: %m"); } - if(link->icmp6_router_discovery) { + if(link->ndisc_router_discovery) { if (link->dhcp6_client) { k = sd_dhcp6_client_stop(link->dhcp6_client); if (k < 0) r = log_link_warning_errno(link, r, "Could not stop DHCPv6 client: %m"); } - k = sd_ndisc_stop(link->icmp6_router_discovery); + k = sd_ndisc_stop(link->ndisc_router_discovery); if (k < 0) r = log_link_warning_errno(link, r, "Could not stop ICMPv6 router discovery: %m"); } @@ -1238,11 +1238,11 @@ static int link_acquire_conf(Link *link) { } if (link_dhcp6_enabled(link)) { - assert(link->icmp6_router_discovery); + assert(link->ndisc_router_discovery); log_link_debug(link, "Discovering IPv6 routers"); - r = sd_ndisc_router_discovery_start(link->icmp6_router_discovery); + r = sd_ndisc_router_discovery_start(link->ndisc_router_discovery); if (r < 0) return log_link_warning_errno(link, r, "Could not start IPv6 router discovery: %m"); } @@ -2002,7 +2002,7 @@ static int link_configure(Link *link) { } if (link_dhcp6_enabled(link)) { - r = icmp6_configure(link); + r = ndisc_configure(link); if (r < 0) return r; } |