fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-08 22:58:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

device/wireguard: drop act_stage1_prepare() implementation

Browse source 
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).
This commit is contained in:
Thomas Haller 2019-08-22 07:41:09 +02:00
parent 2d42c1b102
commit cc4d69c1c3
1 changed files with 0 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/devices/nm-device-wireguard.c
View file

@ -1517,17 +1517,6 @@ link_config_delayed_resolver_cb (gpointer user_data)
return G_SOURCE_REMOVE; 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 static NMActStageReturn
act_stage2_config (NMDevice *device, act_stage2_config (NMDevice *device,
NMDeviceStateReason *out_failure_reason) 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->connection_type_check_compatible = NM_SETTING_WIREGUARD_SETTING_NAME;
device_class->link_types = NM_DEVICE_DEFINE_LINK_TYPES (NM_LINK_TYPE_WIREGUARD); 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->state_changed = device_state_changed;
device_class->create_and_realize = create_and_realize; device_class->create_and_realize = create_and_realize;
device_class->act_stage2_config = act_stage2_config; device_class->act_stage2_config = act_stage2_config;