fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-02-09 15:30:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

device: fix handling NM_UNMANAGED_USER_CONF in _get_managed_by_flags()

Browse source 
Found by clang warning:

  src/devices/nm-device.c:11370:14: error: use of logical '||' with constant operand [-Werror,-Wconstant-logical-operand]
                             || NM_UNMANAGED_USER_UDEV
                             ^  ~~~~~~~~~~~~~~~~~~~~~~

Fixes: 5778bc6a34
This commit is contained in:
Thomas Haller 2017-10-05 14:45:25 +02:00
parent 2a63bbfb78
commit 42d1452773
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/devices/nm-device.c
View file

@ -11367,8 +11367,8 @@ _get_managed_by_flags(NMUnmanagedFlags flags, NMUnmanagedFlags mask, gboolean fo
* which is based on the device type.
* It also overwrites the udev configuration and external-down */
flags &= ~( NM_UNMANAGED_BY_DEFAULT
|| NM_UNMANAGED_USER_UDEV
|| NM_UNMANAGED_EXTERNAL_DOWN);
| NM_UNMANAGED_USER_UDEV
| NM_UNMANAGED_EXTERNAL_DOWN);
}
if ( NM_FLAGS_HAS (mask, NM_UNMANAGED_IS_SLAVE)