summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2019-05-07 16:29:20 +0200
committerGitHub <noreply@github.com>2019-05-07 16:29:20 +0200
commit5a1e10ae91974132943cc5e346863921f9f3c486 (patch)
treeb28c0cdd84e30ba8672d39a6bee65d50543e39fe
parentbdafa22d93e410359d5357e46d92fa06e049dd51 (diff)
downloadsystemd-revert-12463-issue-12452-netlink.tar.gz
Revert "networkd: stop clients when networkd shuts down (#12463)"revert-12463-issue-12452-netlink
This reverts commit 946f8e14d59ec1262f1779bc9a65d1c048d6544b.
-rw-r--r--src/network/networkd-link.c2
-rw-r--r--src/network/networkd-link.h2
-rw-r--r--src/network/networkd-manager.c3
3 files changed, 1 insertions, 6 deletions
diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index 533193ac93..532f2d7f96 100644
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -736,7 +736,7 @@ static void link_enter_unmanaged(Link *link) {
link_dirty(link);
}
-int link_stop_clients(Link *link) {
+static int link_stop_clients(Link *link) {
int r = 0, k;
assert(link);
diff --git a/src/network/networkd-link.h b/src/network/networkd-link.h
index 1366a29924..b43401afc6 100644
--- a/src/network/networkd-link.h
+++ b/src/network/networkd-link.h
@@ -171,8 +171,6 @@ int dhcp6_configure(Link *link);
int dhcp6_request_address(Link *link, int ir);
int dhcp6_lease_pd_prefix_lost(sd_dhcp6_client *client, Link* link);
-int link_stop_clients(Link *link);
-
const char* link_state_to_string(LinkState s) _const_;
LinkState link_state_from_string(const char *s) _pure_;
diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c
index 8c461a89e0..c9579370cb 100644
--- a/src/network/networkd-manager.c
+++ b/src/network/networkd-manager.c
@@ -1446,9 +1446,6 @@ void manager_free(Manager *m) {
while ((link = hashmap_steal_first(m->links))) {
if (link->dhcp6_client)
(void) dhcp6_lease_pd_prefix_lost(link->dhcp6_client, link);
-
- link_stop_clients(link);
-
link_unref(link);
}