diff options
| author | Michael Biebl <biebl@debian.org> | 2018-04-23 18:01:04 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2018-04-23 18:01:04 +0200 |
| commit | d00e17d14b5df5f7fcba1a17f91edbb3180fbf64 (patch) | |
| tree | 2b16542fff332a3c38fb2191f7ae4d4795f66451 /libnm-core/nm-setting-ovs-patch.c | |
| parent | 2e03b565aa24225ca4992797a5d563542b0b2bdd (diff) | |
| parent | f60117b41d5433be1b4a96d82cd11d0c3dce9b63 (diff) | |
Update upstream source from tag 'upstream/1.11.3'
Update to upstream version '1.11.3' with Debian dir a3a34e6c602cb81e76dc3c255c617e7f7ecfc11c
Diffstat (limited to 'libnm-core/nm-setting-ovs-patch.c')
| -rw-r--r-- | libnm-core/nm-setting-ovs-patch.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/libnm-core/nm-setting-ovs-patch.c b/libnm-core/nm-setting-ovs-patch.c index 9e380914..3689aecf 100644 --- a/libnm-core/nm-setting-ovs-patch.c +++ b/libnm-core/nm-setting-ovs-patch.c @@ -83,7 +83,6 @@ static int verify (NMSetting *setting, NMConnection *connection, GError **error) { NMSettingOvsPatch *self = NM_SETTING_OVS_PATCH (setting); - int family = AF_UNSPEC; if (!_nm_connection_verify_required_interface_name (connection, error)) return FALSE; @@ -99,11 +98,8 @@ verify (NMSetting *setting, NMConnection *connection, GError **error) return FALSE; } - if (nm_utils_ipaddr_valid (AF_INET, self->peer)) - family = AF_INET; - else if (nm_utils_ipaddr_valid (AF_INET6, self->peer)) - family = AF_INET6; - else { + if ( !nm_utils_ipaddr_valid (AF_INET, self->peer) + && !nm_utils_ipaddr_valid (AF_INET6, self->peer)) { g_set_error (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY, |