diff --git a/src/devices/nm-device-wifi.c b/src/devices/nm-device-wifi.c index df90671ed9..b3b8c70f96 100644 --- a/src/devices/nm-device-wifi.c +++ b/src/devices/nm-device-wifi.c @@ -3338,15 +3338,6 @@ activation_failure_handler (NMDevice *dev) wifi_utils_indicate_addressing_running (NM_DEVICE_WIFI_GET_PRIVATE (dev)->wifi_data, FALSE); } -static gboolean -can_interrupt_activation (NMDevice *dev) -{ - if (nm_device_get_state (dev) == NM_DEVICE_STATE_NEED_AUTH) - return TRUE; - - return FALSE; -} - static void device_state_changed (NMDevice *device, NMDeviceState new_state, @@ -3643,7 +3634,6 @@ nm_device_wifi_class_init (NMDeviceWifiClass *klass) parent_class->act_stage4_ip4_config_timeout = act_stage4_ip4_config_timeout; parent_class->act_stage4_ip6_config_timeout = act_stage4_ip6_config_timeout; parent_class->deactivate = deactivate; - parent_class->can_interrupt_activation = can_interrupt_activation; parent_class->state_changed = device_state_changed; diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index 761617df82..9eeb3b6ca4 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -4872,31 +4872,6 @@ nm_device_is_activating (NMDevice *device) return priv->act_source_id ? TRUE : FALSE; } - -static gboolean -can_interrupt_activation (NMDevice *device) -{ - NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (device); - - /* Devices that support carrier detect can interrupt activation - * if the link becomes inactive and carrier is honored. - */ - return !priv->carrier && !priv->ignore_carrier; - -} - -gboolean -nm_device_can_interrupt_activation (NMDevice *self) -{ - gboolean interrupt = FALSE; - - g_return_val_if_fail (self != NULL, FALSE); - - if (NM_DEVICE_GET_CLASS (self)->can_interrupt_activation) - interrupt = NM_DEVICE_GET_CLASS (self)->can_interrupt_activation (self); - return interrupt; -} - /* IP Configuration stuff */ NMDHCP4Config * @@ -5861,7 +5836,6 @@ nm_device_class_init (NMDeviceClass *klass) klass->bring_up = bring_up; klass->take_down = take_down; klass->carrier_changed = carrier_changed; - klass->can_interrupt_activation = can_interrupt_activation; klass->get_hw_address_length = get_hw_address_length; /* Properties */ diff --git a/src/devices/nm-device.h b/src/devices/nm-device.h index ed1c803f4c..297bbe9cfc 100644 --- a/src/devices/nm-device.h +++ b/src/devices/nm-device.h @@ -180,8 +180,6 @@ typedef struct { void (* deactivate) (NMDevice *self); - gboolean (* can_interrupt_activation) (NMDevice *self); - gboolean (* spec_match_list) (NMDevice *self, const GSList *specs); /* Update the connection with currently configured L2 settings */ @@ -279,7 +277,6 @@ NMConnection * nm_device_find_assumable_connection (NMDevice *device, gboolean nm_device_spec_match_list (NMDevice *device, const GSList *specs); gboolean nm_device_is_activating (NMDevice *dev); -gboolean nm_device_can_interrupt_activation (NMDevice *self); gboolean nm_device_autoconnect_allowed (NMDevice *self); NMDeviceState nm_device_get_state (NMDevice *device);