From c2de0d98ba39e0a1a970d066fd19be786092f376 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 1 Mar 2016 16:55:22 +0100 Subject: Imported Upstream version 1.1.91 --- src/platform/nmp-object.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'src/platform/nmp-object.c') diff --git a/src/platform/nmp-object.c b/src/platform/nmp-object.c index 892fd9dd..b7b04490 100644 --- a/src/platform/nmp-object.c +++ b/src/platform/nmp-object.c @@ -18,16 +18,17 @@ * Copyright (C) 2015 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" + +#include "nmp-object.h" #include -#include "nm-default.h" -#include "nmp-object.h" -#include "nm-platform-utils.h" -#include "NetworkManagerUtils.h" #include "nm-utils.h" +#include "nm-core-utils.h" +#include "nm-platform-utils.h" + /*********************************************************************************************/ #define _NMLOG_DOMAIN LOGD_PLATFORM @@ -1256,7 +1257,7 @@ nmp_cache_link_connected_needs_toggle (const NMPCache *cache, const NMPObject *m /* if native IFF_LOWER_UP is down, link.connected must also be down * regardless of the slaves. */ - if (!NM_FLAGS_HAS (master->link.flags, IFF_LOWER_UP)) + if (!NM_FLAGS_HAS (master->link.n_ifi_flags, IFF_LOWER_UP)) return !!master->link.connected; if (potential_slave && NMP_OBJECT_GET_TYPE (potential_slave) != NMP_OBJECT_TYPE_LINK) -- cgit 1.3.0-6-gf8a5