From 5ea7e6086a296a5e7facc3c044f3b5677a75c4b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Klime=C5=A1?= Date: Mon, 27 Feb 2012 16:42:07 +0100 Subject: [PATCH] core: use glib's CLAMP() macro to simplify ipv6_privacy boundary check --- src/nm-device.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/nm-device.c b/src/nm-device.c index e327abde46..814a144850 100644 --- a/src/nm-device.c +++ b/src/nm-device.c @@ -2241,8 +2241,7 @@ real_act_stage3_ip6_config_start (NMDevice *self, if (s_ip6) ip6_privacy = nm_setting_ip6_config_get_ip6_privacy (s_ip6); } - ip6_privacy = ip6_privacy < -1 ? NM_SETTING_IP6_CONFIG_PRIVACY_UNKNOWN : ip6_privacy; - ip6_privacy = ip6_privacy > 2 ? NM_SETTING_IP6_CONFIG_PRIVACY_PREFER_TEMP_ADDR : ip6_privacy; + ip6_privacy = CLAMP (ip6_privacy, NM_SETTING_IP6_CONFIG_PRIVACY_UNKNOWN, NM_SETTING_IP6_CONFIG_PRIVACY_PREFER_TEMP_ADDR); switch (ip6_privacy) { case NM_SETTING_IP6_CONFIG_PRIVACY_UNKNOWN: