From cc4d69c1c3629ba3322cae7d4f03cc136d063c8a Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Thu, 22 Aug 2019 07:41:09 +0200 Subject: [PATCH] device/wireguard: drop act_stage1_prepare() implementation act_stage1_prepare() should become re-entrant. That means, we should not clear the state there. Instead, we clear it where necessary or on deactivate (which we do already). --- src/devices/nm-device-wireguard.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/src/devices/nm-device-wireguard.c b/src/devices/nm-device-wireguard.c index e3b8e8b4c4..572389b114 100644 --- a/src/devices/nm-device-wireguard.c +++ b/src/devices/nm-device-wireguard.c @@ -1517,17 +1517,6 @@ link_config_delayed_resolver_cb (gpointer user_data) return G_SOURCE_REMOVE; } -static NMActStageReturn -act_stage1_prepare (NMDevice *device, NMDeviceStateReason *out_failure_reason) -{ - NMDeviceWireGuardPrivate *priv = NM_DEVICE_WIREGUARD_GET_PRIVATE (device); - - priv->auto_default_route_initialized = FALSE; - priv->auto_default_route_priority_initialized = FALSE; - - return NM_DEVICE_CLASS (nm_device_wireguard_parent_class)->act_stage1_prepare (device, out_failure_reason); -} - static NMActStageReturn act_stage2_config (NMDevice *device, NMDeviceStateReason *out_failure_reason) @@ -1968,7 +1957,6 @@ nm_device_wireguard_class_init (NMDeviceWireGuardClass *klass) device_class->connection_type_check_compatible = NM_SETTING_WIREGUARD_SETTING_NAME; device_class->link_types = NM_DEVICE_DEFINE_LINK_TYPES (NM_LINK_TYPE_WIREGUARD); - device_class->act_stage1_prepare = act_stage1_prepare; device_class->state_changed = device_state_changed; device_class->create_and_realize = create_and_realize; device_class->act_stage2_config = act_stage2_config;