From: Thomas Haller Date: Wed, 23 Mar 2016 08:49:39 +0000 (+0100) Subject: device: trival refactoring in can_unmanaged_external_down() X-Git-Url: https://iam.tj/gitweb/gitweb.cgi?p=NetworkManager.git;a=commitdiff_plain;h=c1f58e9bb6c1cf8b48968b0986317dc98666d6c9 device: trival refactoring in can_unmanaged_external_down() Swap order of operands so that the "cheaper" is evaluated first. --- diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index 529b3cd82..cae4e6888 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