diff options
| author | Michael Biebl <biebl@debian.org> | 2018-07-03 23:54:48 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2018-07-03 23:54:48 +0200 |
| commit | 54de7f04d1fac5f29fd54ec4120ba2fc4f9b5714 (patch) | |
| tree | 87729385ff8de744dc44d0b4cc75916494b2fd38 /libnm-core/nm-setting-macvlan.c | |
| parent | 680d3db45106e7a18665a366e1b57e58cef61506 (diff) | |
| parent | 329b15110c4b183d7a47552abe3a6a6ff933e817 (diff) | |
Merge branch 'experimental'
Diffstat (limited to 'libnm-core/nm-setting-macvlan.c')
| -rw-r--r-- | libnm-core/nm-setting-macvlan.c | 8 |
1 files changed, 2 insertions, 6 deletions
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) |