summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2016-03-23 09:49:39 +0100
committerThomas Haller <thaller@redhat.com>2016-03-30 18:50:52 +0200
commitc1f58e9bb6c1cf8b48968b0986317dc98666d6c9 (patch)
treed32993251c61dcd03ab12e3ce4e9ea1398571b35
parent03fd18cde053f2765e057b354e8ca0f751e6e103 (diff)
downloadNetworkManager-c1f58e9bb6c1cf8b48968b0986317dc98666d6c9.tar.gz
device: trival refactoring in can_unmanaged_external_down()
Swap order of operands so that the "cheaper" is evaluated first.
-rw-r--r--src/devices/nm-device.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
index 529b3cd821..cae4e68884 100644
--- a/src/devices/nm-device.c
+++ b/src/devices/nm-device.c
@@ -1195,7 +1195,8 @@ nm_device_master_release_one_slave (NMDevice *self, NMDevice *slave, gboolean co
static gboolean
can_unmanaged_external_down (NMDevice *self)
{
- return nm_device_is_software (self) && !NM_DEVICE_GET_PRIVATE (self)->is_nm_owned;
+ return !NM_DEVICE_GET_PRIVATE (self)->is_nm_owned
+ && nm_device_is_software (self);
}
static void