From 6d454c8bdf1c80bd49517cabca9c0f0d3031f81e Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Mon, 15 Jun 2015 17:25:04 +0200 Subject: [PATCH] device: don't check for NM_PLATFORM_ERROR_NOT_FOUND in set_nm_ipv6ll() Unconditionally log a warning if the function fails. We are about to drop nm_platform_get_error(), it's anyway unclear why we don't want to log a warning about non-existing interface. (cherry picked from commit 8334171a4e8c423f524ea530e8bd1b4ff40d9e6e) --- src/devices/nm-device.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index 2a1dbacf96..9619d4ca7b 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -4572,8 +4572,7 @@ set_nm_ipv6ll (NMDevice *self, gboolean enable) const char *detail = enable ? "enable" : "disable"; _LOGD (LOGD_IP6, "will %s userland IPv6LL", detail); - if ( !nm_platform_link_set_user_ipv6ll_enabled (NM_PLATFORM_GET, ifindex, enable) - && nm_platform_get_error (NM_PLATFORM_GET) != NM_PLATFORM_ERROR_NOT_FOUND) + if (!nm_platform_link_set_user_ipv6ll_enabled (NM_PLATFORM_GET, ifindex, enable)) _LOGW (LOGD_IP6, "failed to %s userspace IPv6LL address handling", detail); if (enable) {