diff options
| author | Thomas Haller <thaller@redhat.com> | 2022-05-17 11:23:19 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2022-05-31 18:32:34 +0200 |
| commit | 9abcf3a53cce71fb9c1150750b301598c9a7413f (patch) | |
| tree | 498302f49d270615e5f21e8d236c82ae647ec13e | |
| parent | 7db07faa5e31c077dd9a817cac52cc1e04a6e28b (diff) | |
| download | NetworkManager-9abcf3a53cce71fb9c1150750b301598c9a7413f.tar.gz | |
dhcp/trivial: rename connect_l3cfg_notify() to l3_cfg_notify_check_connected()
The function subscribes a callback l3_cfg_notify_cb(). Rename so that
related functions have a clearly related name.
| -rw-r--r-- | src/core/dhcp/nm-dhcp-client.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/core/dhcp/nm-dhcp-client.c b/src/core/dhcp/nm-dhcp-client.c index e5abbfa721..1d92ef06f9 100644 --- a/src/core/dhcp/nm-dhcp-client.c +++ b/src/core/dhcp/nm-dhcp-client.c @@ -183,7 +183,7 @@ _emit_notify(NMDhcpClient *self, const NMDhcpClientNotifyData *notify_data) /*****************************************************************************/ static void -connect_l3cfg_notify(NMDhcpClient *self) +l3_cfg_notify_check_connected(NMDhcpClient *self) { NMDhcpClientPrivate *priv = NM_DHCP_CLIENT_GET_PRIVATE(self); gboolean do_connect; @@ -418,7 +418,7 @@ _nm_dhcp_client_notify(NMDhcpClient *self, } else { priv->l3cfg_notify.wait_dhcp_commit = FALSE; } - connect_l3cfg_notify(self); + l3_cfg_notify_check_connected(self); { const NMDhcpClientNotifyData notify_data = { @@ -591,7 +591,7 @@ l3_cfg_notify_cb(NML3Cfg *l3cfg, const NML3ConfigNotifyData *notify_data, NMDhcp if (addr) { _LOGD("got IPv6LL address, starting transaction"); priv->l3cfg_notify.wait_ll_address = FALSE; - connect_l3cfg_notify(self); + l3_cfg_notify_check_connected(self); nm_clear_g_source_inst(&priv->v6.lladdr_timeout_source); _no_lease_timeout_schedule(self); @@ -642,7 +642,7 @@ l3_cfg_notify_cb(NML3Cfg *l3cfg, const NML3ConfigNotifyData *notify_data, NMDhcp } priv->l3cfg_notify.wait_dhcp_commit = FALSE; - connect_l3cfg_notify(self); + l3_cfg_notify_check_connected(self); _LOGD("accept address"); @@ -696,7 +696,7 @@ nm_dhcp_client_start(NMDhcpClient *self, GError **error) if (!addr) { _LOGD("waiting for IPv6LL address"); priv->l3cfg_notify.wait_ll_address = TRUE; - connect_l3cfg_notify(self); + l3_cfg_notify_check_connected(self); priv->v6.lladdr_timeout_source = nm_g_timeout_add_seconds_source(10, ipv6_lladdr_timeout, self); return TRUE; @@ -789,7 +789,7 @@ nm_dhcp_client_stop(NMDhcpClient *self, gboolean release) priv->l3cfg_notify.wait_dhcp_commit = FALSE; priv->l3cfg_notify.wait_ll_address = FALSE; - connect_l3cfg_notify(self); + l3_cfg_notify_check_connected(self); /* Kill the DHCP client */ old_pid = priv->pid; |