system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-07-22 02:35:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

device: reorder checks in check_connection_available()

Browse source 
No change in behavior. Just reorder, so that the checks that can be
reviewed in place are handled first.
This commit is contained in:
Thomas Haller 2023-06-12 15:14:11 +02:00
parent b3b8323499
commit 42f20a4edf
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
1 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/core/devices/nm-device.c
View file

@ -15324,10 +15324,7 @@ check_connection_available(NMDevice *self,
{
NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE(self);
/* Connections which require a network connection are not available when
* the device has no carrier, even with ignore-carrer=TRUE.
*/
if (priv->carrier || !connection_requires_carrier(connection))
if (priv->carrier)
return TRUE;
if (NM_FLAGS_HAS(flags, _NM_DEVICE_CHECK_CON_AVAILABLE_FOR_USER_REQUEST_WAITING_CARRIER)
@ -15339,12 +15336,6 @@ check_connection_available(NMDevice *self,
return TRUE;
}
/* master types are always available even without carrier.
* Making connection non-available would un-enslave slaves which
* is not desired. */
if (nm_device_is_master(self))
return TRUE;
if (!priv->up) {
/* If the device is !IFF_UP it also has no carrier. But we assume that if we
* would start activating the device (and thereby set the device IFF_UP),
@ -15354,6 +15345,18 @@ check_connection_available(NMDevice *self,
return TRUE;
}
if (!connection_requires_carrier(connection)) {
/* Connections that don't require carrier are available. */
return TRUE;
}
if (nm_device_is_master(self)) {
/* master types are always available even without carrier.
* Making connection non-available would un-enslave slaves which
* is not desired. */
return TRUE;
}
nm_utils_error_set_literal(error,
NM_UTILS_ERROR_CONNECTION_AVAILABLE_TEMPORARY,
"device has no carrier");