summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Williams <dcbw@redhat.com>2014-10-13 10:24:56 -0500
committerDan Williams <dcbw@redhat.com>2014-10-27 13:46:06 -0500
commit07e086dd0da570933d2271fb8e60dde35d717b69 (patch)
treecce20661a84790c7f88072f9567ae447d298876c
parent82d62c2c4ee8899d5e880d11d25bab891cd9e753 (diff)
downloadNetworkManager-07e086dd0da570933d2271fb8e60dde35d717b69.tar.gz
core: shared connections don't require a carrier
They are effectively static connections since the address is manually assigned, so they do not require a carrier.
-rw-r--r--src/devices/nm-device.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
index 4b0840443d..49d0402885 100644
--- a/src/devices/nm-device.c
+++ b/src/devices/nm-device.c
@@ -6320,7 +6320,8 @@ connection_requires_carrier (NMConnection *connection)
method = nm_utils_get_ip_config_method (connection, NM_TYPE_SETTING_IP4_CONFIG);
if ( strcmp (method, NM_SETTING_IP4_CONFIG_METHOD_MANUAL) != 0
- && strcmp (method, NM_SETTING_IP4_CONFIG_METHOD_DISABLED) != 0) {
+ && strcmp (method, NM_SETTING_IP4_CONFIG_METHOD_DISABLED) != 0
+ && strcmp (method, NM_SETTING_IP4_CONFIG_METHOD_SHARED) != 0) {
ip4_carrier_wanted = TRUE;
/* If IPv4 wants a carrier and cannot fail, the whole connection