From b7eb622c247656595a04aa6a32ef17ba4cf15a2a Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Tue, 1 Dec 2015 23:43:13 +0100 Subject: [PATCH] ip-tunnel: don't update_properties() during update_connection()/check_connection_compatible() The device properties are obtained via netlink, thus we get proper platform notifications whenever they change. So the device properties always reflect the platform state and there is no need to refresh it during update_connection()/check_connection_compatible(). --- src/devices/nm-device-ip-tunnel.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/devices/nm-device-ip-tunnel.c b/src/devices/nm-device-ip-tunnel.c index 056135fbfd..4cf2a689f6 100644 --- a/src/devices/nm-device-ip-tunnel.c +++ b/src/devices/nm-device-ip-tunnel.c @@ -370,8 +370,6 @@ update_connection (NMDevice *device, NMConnection *connection) nm_connection_add_setting (connection, (NMSetting *) s_ip_tunnel); } - update_properties (device); - if (nm_setting_ip_tunnel_get_mode (s_ip_tunnel) != priv->mode) g_object_set (G_OBJECT (s_ip_tunnel), NM_SETTING_IP_TUNNEL_MODE, priv->mode, NULL); @@ -505,8 +503,6 @@ check_connection_compatible (NMDevice *device, NMConnection *connection) if (!s_ip_tunnel) return FALSE; - update_properties (device); - /* Check parent interface; could be an interface name or a UUID */ parent = nm_setting_ip_tunnel_get_parent (s_ip_tunnel); if (parent) {