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-tun.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libnm-core/nm-setting-tun.c') diff --git a/libnm-core/nm-setting-tun.c b/libnm-core/nm-setting-tun.c index dab407bd..edcb3ffd 100644 --- a/libnm-core/nm-setting-tun.c +++ b/libnm-core/nm-setting-tun.c @@ -179,8 +179,8 @@ verify (NMSetting *setting, NMConnection *connection, GError **error) { NMSettingTunPrivate *priv = NM_SETTING_TUN_GET_PRIVATE (setting); - if ( priv->mode != NM_SETTING_TUN_MODE_TUN - && priv->mode != NM_SETTING_TUN_MODE_TAP) { + if (!NM_IN_SET (priv->mode, NM_SETTING_TUN_MODE_TUN, + NM_SETTING_TUN_MODE_TAP)) { g_set_error (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY, -- cgit 1.3.0-6-gf8a5