diff options
| author | Thomas Haller <thaller@redhat.com> | 2017-10-05 14:45:25 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2017-10-05 14:47:03 +0200 |
| commit | 42d1452773a9a85b4134049d63384cf7a8bb3a68 (patch) | |
| tree | e7efc06a57cebabbb2abbcb50dfe05df11fe8997 | |
| parent | 2a63bbfb789819562e352928aba8cd16e0c0d0ee (diff) | |
| download | NetworkManager-42d1452773a9a85b4134049d63384cf7a8bb3a68.tar.gz | |
device: fix handling NM_UNMANAGED_USER_CONF in _get_managed_by_flags()
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: 5778bc6a34f2291d68247695119f2170bc3bf8b3
| -rw-r--r-- | src/devices/nm-device.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index b81a235c3e..68ef549a3b 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -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) |