diff options
| author | Thomas Haller <thaller@redhat.com> | 2017-06-01 21:50:40 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2017-06-02 21:06:08 +0200 |
| commit | f2f9a635ff163301ea0966496ff57f5ded029e02 (patch) | |
| tree | 01e26ff543d13bb612a0c7947ac830906641e0d0 | |
| parent | 10efbc588777f3b592008085c539076e33c6a079 (diff) | |
| download | NetworkManager-f2f9a635ff163301ea0966496ff57f5ded029e02.tar.gz | |
device: rename activate_stage5_ip4_config_commit() to activate_stage5_ip4_config_result()
We have nm_device_activate_schedule_ip4_config_result(). The name
should match.
Note, this affects logging, as we log the function name.
| -rw-r--r-- | src/devices/nm-device.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index fe81478f44..b5d3af68c6 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -8268,7 +8268,7 @@ arp_announce (NMDevice *self) } static void -activate_stage5_ip4_config_commit (NMDevice *self) +activate_stage5_ip4_config_result (NMDevice *self) { NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self); NMActRequest *req; @@ -8340,7 +8340,7 @@ nm_device_activate_schedule_ip4_config_result (NMDevice *self, NMIP4Config *conf if (config) priv->dev_ip4_config = g_object_ref (config); - activation_source_schedule (self, activate_stage5_ip4_config_commit, AF_INET); + activation_source_schedule (self, activate_stage5_ip4_config_result, AF_INET); } gboolean @@ -10540,7 +10540,7 @@ update_ip4_config (NMDevice *self, gboolean initial) */ if ( !initial && activation_source_is_scheduled (self, - activate_stage5_ip4_config_commit, + activate_stage5_ip4_config_result, AF_INET)) { priv->queued_ip4_config_pending = FALSE; priv->queued_ip4_config_id = g_idle_add (queued_ip4_config_change, self); @@ -13523,7 +13523,7 @@ _activation_func_to_string (ActivationHandleFunc func) FUNC_TO_STRING_CHECK_AND_RETURN (func, activate_stage3_ip_config_start); FUNC_TO_STRING_CHECK_AND_RETURN (func, activate_stage4_ip4_config_timeout); FUNC_TO_STRING_CHECK_AND_RETURN (func, activate_stage4_ip6_config_timeout); - FUNC_TO_STRING_CHECK_AND_RETURN (func, activate_stage5_ip4_config_commit); + FUNC_TO_STRING_CHECK_AND_RETURN (func, activate_stage5_ip4_config_result); FUNC_TO_STRING_CHECK_AND_RETURN (func, activate_stage5_ip6_config_commit); g_return_val_if_reached ("unknown"); } |