diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2022-02-18 11:27:58 +0100 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2022-02-18 14:12:52 +0100 |
| commit | fd8932ef6922c006b42206e0d83eafb1bdb52eb2 (patch) | |
| tree | 804022447589b6e28199d6be2b3c349844abc070 /src/core/devices | |
| parent | 3d34f1b6b63687df017e1bda5346ffaa292ab34a (diff) | |
| download | NetworkManager-fd8932ef6922c006b42206e0d83eafb1bdb52eb2.tar.gz | |
utils: remove signal argument from nm_utils_kill_child_async()
...and rename it appropriately.
We always call it with SIGTERM, so this simplifies thing a bit.
Diffstat (limited to 'src/core/devices')
| -rw-r--r-- | src/core/devices/nm-device.c | 3 | ||||
| -rw-r--r-- | src/core/devices/team/nm-device-team.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/core/devices/nm-device.c b/src/core/devices/nm-device.c index bebfc4c3ab..b5531799a0 100644 --- a/src/core/devices/nm-device.c +++ b/src/core/devices/nm-device.c @@ -13370,8 +13370,7 @@ ip_check_gw_ping_cleanup(NMDevice *self) nm_clear_g_source(&priv->gw_ping.timeout); if (priv->gw_ping.pid) { - nm_utils_kill_child_async(priv->gw_ping.pid, - SIGTERM, + nm_utils_term_child_async(priv->gw_ping.pid, priv->gw_ping.log_domain, "ping", 1000, diff --git a/src/core/devices/team/nm-device-team.c b/src/core/devices/team/nm-device-team.c index 16cd2e8715..2b8005d089 100644 --- a/src/core/devices/team/nm-device-team.c +++ b/src/core/devices/team/nm-device-team.c @@ -287,8 +287,7 @@ teamd_cleanup(NMDeviceTeam *self, gboolean free_tdc) if (priv->teamd_pid > 0) { priv->kill_in_progress = TRUE; - nm_utils_kill_child_async(priv->teamd_pid, - SIGTERM, + nm_utils_term_child_async(priv->teamd_pid, LOGD_TEAM, "teamd", 2000, |