From 22d72483f6c27939adead5a62107e715c133cbef Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Fri, 7 Oct 2011 13:08:43 -0500 Subject: [PATCH] core: remove unused 'config' parameter from IP timeout methods Long ago used to create an IPv4 LL config when DHCP failed, but we don't do that anymore, and it should be done differently anyway. --- src/nm-device-wifi.c | 12 ++++-------- src/nm-device.c | 30 ++++-------------------------- src/nm-device.h | 2 -- 3 files changed, 8 insertions(+), 36 deletions(-) diff --git a/src/nm-device-wifi.c b/src/nm-device-wifi.c index dcdf440925..4f6295b88d 100644 --- a/src/nm-device-wifi.c +++ b/src/nm-device-wifi.c @@ -2795,9 +2795,7 @@ handle_ip_config_timeout (NMDeviceWifi *self, static NMActStageReturn -real_act_stage4_ip4_config_timeout (NMDevice *dev, - NMIP4Config **config, - NMDeviceStateReason *reason) +real_act_stage4_ip4_config_timeout (NMDevice *dev, NMDeviceStateReason *reason) { NMActRequest *req; NMConnection *connection; @@ -2816,15 +2814,13 @@ real_act_stage4_ip4_config_timeout (NMDevice *dev, ret = handle_ip_config_timeout (NM_DEVICE_WIFI (dev), connection, may_fail, &chain_up, reason); if (chain_up) - ret = NM_DEVICE_CLASS (nm_device_wifi_parent_class)->act_stage4_ip4_config_timeout (dev, config, reason); + ret = NM_DEVICE_CLASS (nm_device_wifi_parent_class)->act_stage4_ip4_config_timeout (dev, reason); return ret; } static NMActStageReturn -real_act_stage4_ip6_config_timeout (NMDevice *dev, - NMIP6Config **config, - NMDeviceStateReason *reason) +real_act_stage4_ip6_config_timeout (NMDevice *dev, NMDeviceStateReason *reason) { NMActRequest *req; NMConnection *connection; @@ -2843,7 +2839,7 @@ real_act_stage4_ip6_config_timeout (NMDevice *dev, ret = handle_ip_config_timeout (NM_DEVICE_WIFI (dev), connection, may_fail, &chain_up, reason); if (chain_up) - ret = NM_DEVICE_CLASS (nm_device_wifi_parent_class)->act_stage4_ip6_config_timeout (dev, config, reason); + ret = NM_DEVICE_CLASS (nm_device_wifi_parent_class)->act_stage4_ip6_config_timeout (dev, reason); return ret; } diff --git a/src/nm-device.c b/src/nm-device.c index 36dc5508a8..7188e64779 100644 --- a/src/nm-device.c +++ b/src/nm-device.c @@ -2216,13 +2216,8 @@ nm_device_activate_schedule_stage4_ip4_config_get (NMDevice *self) static NMActStageReturn -real_act_stage4_ip4_config_timeout (NMDevice *self, - NMIP4Config **config, - NMDeviceStateReason *reason) +real_act_stage4_ip4_config_timeout (NMDevice *self, NMDeviceStateReason *reason) { - g_return_val_if_fail (config != NULL, NM_ACT_STAGE_RETURN_FAILURE); - g_return_val_if_fail (*config == NULL, NM_ACT_STAGE_RETURN_FAILURE); - /* Notify of invalid DHCP4 config object */ g_object_notify (G_OBJECT (self), NM_DEVICE_INTERFACE_DHCP4_CONFIG); @@ -2246,7 +2241,6 @@ nm_device_activate_stage4_ip4_config_timeout (gpointer user_data) { NMDevice *self = NM_DEVICE (user_data); NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self); - NMIP4Config *ip4_config = NULL; const char *iface; NMActStageReturn ret = NM_ACT_STAGE_RETURN_FAILURE; NMDeviceStateReason reason = NM_DEVICE_STATE_REASON_NONE; @@ -2259,7 +2253,7 @@ nm_device_activate_stage4_ip4_config_timeout (gpointer user_data) "Activation (%s) Stage 4 of 5 (IP4 Configure Timeout) started...", iface); - ret = NM_DEVICE_GET_CLASS (self)->act_stage4_ip4_config_timeout (self, &ip4_config, &reason); + ret = NM_DEVICE_GET_CLASS (self)->act_stage4_ip4_config_timeout (self, &reason); if (ret == NM_ACT_STAGE_RETURN_POSTPONE) goto out; else if (ret == NM_ACT_STAGE_RETURN_FAILURE) { @@ -2268,11 +2262,6 @@ nm_device_activate_stage4_ip4_config_timeout (gpointer user_data) } g_assert (ret == NM_ACT_STAGE_RETURN_SUCCESS); - if (ip4_config) { - g_object_set_data (G_OBJECT (nm_device_get_act_request (self)), - NM_ACT_REQUEST_IP4_CONFIG, ip4_config); - } - priv->ip4_ready = TRUE; nm_device_activate_stage5_ip_config_commit (self); @@ -2436,13 +2425,8 @@ nm_device_activate_schedule_stage4_ip6_config_get (NMDevice *self) static NMActStageReturn -real_act_stage4_ip6_config_timeout (NMDevice *self, - NMIP6Config **config, - NMDeviceStateReason *reason) +real_act_stage4_ip6_config_timeout (NMDevice *self, NMDeviceStateReason *reason) { - g_return_val_if_fail (config != NULL, NM_ACT_STAGE_RETURN_FAILURE); - g_return_val_if_fail (*config == NULL, NM_ACT_STAGE_RETURN_FAILURE); - /* Notify of invalid DHCP4 config object */ g_object_notify (G_OBJECT (self), NM_DEVICE_INTERFACE_DHCP6_CONFIG); @@ -2466,7 +2450,6 @@ nm_device_activate_stage4_ip6_config_timeout (gpointer user_data) { NMDevice *self = NM_DEVICE (user_data); NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self); - NMIP6Config *ip6_config = NULL; const char *iface; NMActStageReturn ret = NM_ACT_STAGE_RETURN_FAILURE; NMDeviceStateReason reason = NM_DEVICE_STATE_REASON_NONE; @@ -2479,7 +2462,7 @@ nm_device_activate_stage4_ip6_config_timeout (gpointer user_data) "Activation (%s) Stage 4 of 5 (IP6 Configure Timeout) started...", iface); - ret = NM_DEVICE_GET_CLASS (self)->act_stage4_ip6_config_timeout (self, &ip6_config, &reason); + ret = NM_DEVICE_GET_CLASS (self)->act_stage4_ip6_config_timeout (self, &reason); if (ret == NM_ACT_STAGE_RETURN_POSTPONE) goto out; else if (ret == NM_ACT_STAGE_RETURN_FAILURE) { @@ -2488,11 +2471,6 @@ nm_device_activate_stage4_ip6_config_timeout (gpointer user_data) } g_assert (ret == NM_ACT_STAGE_RETURN_SUCCESS); - if (ip6_config) { - g_object_set_data (G_OBJECT (nm_device_get_act_request (self)), - NM_ACT_REQUEST_IP6_CONFIG, ip6_config); - } - priv->ip6_ready = TRUE; nm_device_activate_stage5_ip_config_commit (self); diff --git a/src/nm-device.h b/src/nm-device.h index 1d080eda50..89abbea020 100644 --- a/src/nm-device.h +++ b/src/nm-device.h @@ -109,10 +109,8 @@ typedef struct { NMIP6Config **config, NMDeviceStateReason *reason); NMActStageReturn (* act_stage4_ip4_config_timeout) (NMDevice *self, - NMIP4Config **config, NMDeviceStateReason *reason); NMActStageReturn (* act_stage4_ip6_config_timeout) (NMDevice *self, - NMIP6Config **config, NMDeviceStateReason *reason); void (* deactivate) (NMDevice *self);