diff options
| author | Thomas Haller <thaller@redhat.com> | 2015-10-19 14:44:38 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2015-10-19 15:51:01 +0200 |
| commit | be3aee8b32b448e61b87d1e050f6c1a9d6a61afc (patch) | |
| tree | 568df45cdfd4367bfddcabf315d1447130786347 | |
| parent | 971a7611bdab8da2c1f6f3ef199f99999202b93a (diff) | |
| download | NetworkManager-be3aee8b32b448e61b87d1e050f6c1a9d6a61afc.tar.gz | |
device: don't wait for carrier when activating static connection
When the connection to be activated doesn't require carrier,
don't queue it to wait for it.
https://bugzilla.redhat.com/show_bug.cgi?id=1079353
Fixes: 0bfe635119facb8514e8f5824f599f4c4c3514e2
(cherry picked from commit 118de885eab0a161db291f1c2fb14690b891b00e)
| -rw-r--r-- | src/devices/nm-device.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index 531e45f9ca..9106af8ac8 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -6376,6 +6376,8 @@ _carrier_wait_check_act_request_must_queue (NMDevice *self, NMActRequest *req) return FALSE; connection = nm_act_request_get_connection (req); + if (!connection_requires_carrier (connection)) + return FALSE; if (!nm_device_check_connection_available (self, connection, NM_DEVICE_CHECK_CON_AVAILABLE_ALL, NULL)) { /* We passed all @flags we have, and no @specific_object. |