From e152ec7bf4ba252ff9d3eb13eabd417b931dac9a Mon Sep 17 00:00:00 2001 From: Iain Lane Date: Mon, 24 Sep 2018 09:29:55 +0100 Subject: Import Upstream version 1.12.2 --- libnm-core/nm-setting-macvlan.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'libnm-core/nm-setting-macvlan.c') diff --git a/libnm-core/nm-setting-macvlan.c b/libnm-core/nm-setting-macvlan.c index d684e58d..6fea8b0d 100644 --- a/libnm-core/nm-setting-macvlan.c +++ b/libnm-core/nm-setting-macvlan.c @@ -147,16 +147,12 @@ static gboolean verify (NMSetting *setting, NMConnection *connection, GError **error) { NMSettingMacvlanPrivate *priv = NM_SETTING_MACVLAN_GET_PRIVATE (setting); - NMSettingConnection *s_con; NMSettingWired *s_wired; - if (connection) { - s_con = nm_connection_get_setting_connection (connection); + if (connection) s_wired = nm_connection_get_setting_wired (connection); - } else { - s_con = NULL; + else s_wired = NULL; - } if (priv->parent) { if ( !nm_utils_is_uuid (priv->parent) -- cgit 1.3.0-6-gf8a5