Revert :carrier-detect properties and associated code

Ignoring carrier is generally something you want at the machine level
(eg, for a server), not at the connection level.

12 files changed, 2 insertions, 242 deletions

diff --git a/libnm-util/libnm-util.ver b/libnm-util/libnm-util.ver
index a0ad19f47e..aeb7c15497 100644
--- a/libnm-util/libnm-util.ver
+++ b/libnm-util/libnm-util.ver
@@ -11,7 +11,6 @@ global:
 	nm_connection_error_get_type;
 	nm_connection_error_quark;
 	nm_connection_for_each_setting_value;
-	nm_connection_get_carrier_detect;
 	nm_connection_get_id;
 	nm_connection_get_path;
 	nm_connection_get_setting;
@@ -288,7 +287,6 @@ global:
 	nm_setting_hash_flags_get_type;
 	nm_setting_infiniband_error_get_type;
 	nm_setting_infiniband_error_quark;
-	nm_setting_infiniband_get_carrier_detect;
 	nm_setting_infiniband_get_mac_address;
 	nm_setting_infiniband_get_mtu;
 	nm_setting_infiniband_get_transport_mode;
@@ -417,7 +415,6 @@ global:
 	nm_setting_vlan_clear_priorities;
 	nm_setting_vlan_error_get_type;
 	nm_setting_vlan_error_quark;
-	nm_setting_vlan_get_carrier_detect;
 	nm_setting_vlan_get_flags;
 	nm_setting_vlan_get_id;
 	nm_setting_vlan_get_interface_name;
@@ -453,7 +450,6 @@ global:
 	nm_setting_wired_error_get_type;
 	nm_setting_wired_error_quark;
 	nm_setting_wired_get_auto_negotiate;
-	nm_setting_wired_get_carrier_detect;
 	nm_setting_wired_get_cloned_mac_address;
 	nm_setting_wired_get_duplex;
 	nm_setting_wired_get_mac_address;
diff --git a/libnm-util/nm-connection.c b/libnm-util/nm-connection.c
index 5db5b30913..a74a19bb98 100644
--- a/libnm-util/nm-connection.c
+++ b/libnm-util/nm-connection.c
@@ -1220,42 +1220,6 @@ nm_connection_get_id (NMConnection *connection)
 	return nm_setting_connection_get_id (s_con);
 }
 
-
-/**
- * nm_connection_get_carrier_detect:
- * @connection: the #NMConnection
- *
- * A shortcut to return the "carrier-detect" property from the
- * connection's device-specific #NMSetting.
- *
- * Returns: the connection's "carrier-detect" property, or
- *   %NULL if the connection is for a device that does not
- *   support carrier detection.
- **/
-const char *
-nm_connection_get_carrier_detect (NMConnection *connection)
-{
-	NMSettingConnection *s_con;
-	NMSetting *s_type;
-	const char *type, *ret;
-	char *carrier_detect;
-
-	s_con = nm_connection_get_setting_connection (connection);
-	g_return_val_if_fail (s_con != NULL, NULL);
-
-	type = nm_setting_connection_get_connection_type (s_con);
-	s_type = nm_connection_get_setting_by_name (connection, type);
-	g_return_val_if_fail (s_type != NULL, NULL);
-
-	if (!g_object_class_find_property (G_OBJECT_GET_CLASS (s_type), "carrier-detect"))
-		return NULL;
-
-	g_object_get (G_OBJECT (s_type), "carrier-detect", &carrier_detect, NULL);
-	ret = g_intern_string (carrier_detect);
-	g_free (carrier_detect);
-	return ret;
-}
-
 /*************************************************************/
 
 /**
diff --git a/libnm-util/nm-connection.h b/libnm-util/nm-connection.h
index 3ebffebcd5..4d060cc98f 100644
--- a/libnm-util/nm-connection.h
+++ b/libnm-util/nm-connection.h
@@ -183,11 +183,9 @@ GType         nm_connection_lookup_setting_type (const char *name);
 GType         nm_connection_lookup_setting_type_by_quark (GQuark error_quark);
 
 /* Helpers */
-const char *  nm_connection_get_uuid           (NMConnection *connection);
+const char *  nm_connection_get_uuid      (NMConnection *connection);
 
-const char *  nm_connection_get_id             (NMConnection *connection);
-
-const char *  nm_connection_get_carrier_detect (NMConnection *connection);
+const char *  nm_connection_get_id        (NMConnection *connection);
 
 NMSetting8021x *           nm_connection_get_setting_802_1x            (NMConnection *connection);
 NMSettingBluetooth *       nm_connection_get_setting_bluetooth         (NMConnection *connection);
diff --git a/libnm-util/nm-setting-infiniband.c b/libnm-util/nm-setting-infiniband.c
index 1d20b108a9..137fd6f13b 100644
--- a/libnm-util/nm-setting-infiniband.c
+++ b/libnm-util/nm-setting-infiniband.c
@@ -67,7 +67,6 @@ typedef struct {
 	GByteArray *mac_address;
 	char *transport_mode;
 	guint32 mtu;
-	char *carrier_detect;
 } NMSettingInfinibandPrivate;
 
 enum {
@@ -75,7 +74,6 @@ enum {
 	PROP_MAC_ADDRESS,
 	PROP_MTU,
 	PROP_TRANSPORT_MODE,
-	PROP_CARRIER_DETECT,
 
 	LAST_PROP
 };
@@ -138,21 +136,6 @@ nm_setting_infiniband_get_transport_mode (NMSettingInfiniband *setting)
 	return NM_SETTING_INFINIBAND_GET_PRIVATE (setting)->transport_mode;
 }
 
-/**
- * nm_setting_infiniband_get_carrier_detect:
- * @setting: the #NMSettingInfiniband
- *
- * Returns: the connection's carrier-detection behavior;
- *   See #NMSettingInfiniband:carrier-detect.
- **/
-const char *
-nm_setting_infiniband_get_carrier_detect (NMSettingInfiniband *setting)
-{
-	g_return_val_if_fail (NM_IS_SETTING_INFINIBAND (setting), NULL);
-
-	return NM_SETTING_INFINIBAND_GET_PRIVATE (setting)->carrier_detect;
-}
-
 
 static gboolean
 verify (NMSetting *setting, GSList *all_settings, GError **error)
@@ -183,16 +166,6 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
 		return FALSE;
 	}
 
-	if (priv->carrier_detect && !_nm_utils_carrier_detect_mode_valid (priv->carrier_detect)) {
-		g_set_error (error,
-		             NM_SETTING_INFINIBAND_ERROR,
-		             NM_SETTING_INFINIBAND_ERROR_INVALID_PROPERTY,
-		             _("'%s' is not a valid value for the property"),
-		             priv->carrier_detect);
-		g_prefix_error (error, "%s: ", NM_SETTING_INFINIBAND_CARRIER_DETECT);
-		return FALSE;
-	}
-
 	return TRUE;
 }
 
@@ -207,7 +180,6 @@ finalize (GObject *object)
 {
 	NMSettingInfinibandPrivate *priv = NM_SETTING_INFINIBAND_GET_PRIVATE (object);
 
-	g_free (priv->carrier_detect);
 	g_free (priv->transport_mode);
 	if (priv->mac_address)
 		g_byte_array_free (priv->mac_address, TRUE);
@@ -234,10 +206,6 @@ set_property (GObject *object, guint prop_id,
 		g_free (priv->transport_mode);
 		priv->transport_mode = g_value_dup_string (value);
 		break;
-	case PROP_CARRIER_DETECT:
-		g_free (priv->carrier_detect);
-		priv->carrier_detect = g_value_dup_string (value);
-		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
 		break;
@@ -260,9 +228,6 @@ get_property (GObject *object, guint prop_id,
 	case PROP_TRANSPORT_MODE:
 		g_value_set_string (value, nm_setting_infiniband_get_transport_mode (setting));
 		break;
-	case PROP_CARRIER_DETECT:
-		g_value_set_string (value, nm_setting_infiniband_get_carrier_detect (setting));
-		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
 		break;
@@ -331,29 +296,5 @@ nm_setting_infiniband_class_init (NMSettingInfinibandClass *setting_class)
 							  "The IPoIB transport mode. Either 'datagram' or 'connected'.",
 							  NULL,
 							  G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE));
-
-	/**
-	 * NMSettingInfiniband:carrier-detect:
-	 *
-	 * Controls whether device carrier affects this connection. Possible values
-	 * are 'no', meaning the connection completely ignores carrier; 'yes',
-	 * meaning the connection can only be activated if carrier is present,
-	 * and will be deactivated automatically if carrier is lost; and
-	 * 'on-activate', meaning the connection can only be activated if carrier
-	 * is present, but will not be deactivated if carrier is lost.
-	 **/
-	g_object_class_install_property
-		(object_class, PROP_CARRIER_DETECT,
-		 g_param_spec_string (NM_SETTING_INFINIBAND_CARRIER_DETECT,
-		                      "Carrier-detect",
-		                      "Controls whether device carrier affects this connection. "
-		                      "Possible values are 'no', meaning the connection completely "
-		                      "ignores carrier; 'yes', meaning the connection can only be "
-		                      "activated if carrier is present, and will be deactivated "
-		                      "automatically if carrier is lost; and 'on-activate', meaning "
-		                      "the connection can only be activated if carrier is present, "
-		                      "but will not be deactivated if carrier is lost.",
-		                      "yes",
-		                      G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE));
 }
 
diff --git a/libnm-util/nm-setting-infiniband.h b/libnm-util/nm-setting-infiniband.h
index a599093690..98a3dd5e9c 100644
--- a/libnm-util/nm-setting-infiniband.h
+++ b/libnm-util/nm-setting-infiniband.h
@@ -54,7 +54,6 @@ GQuark nm_setting_infiniband_error_quark (void);
 #define NM_SETTING_INFINIBAND_MAC_ADDRESS    "mac-address"
 #define NM_SETTING_INFINIBAND_MTU            "mtu"
 #define NM_SETTING_INFINIBAND_TRANSPORT_MODE "transport-mode"
-#define NM_SETTING_INFINIBAND_CARRIER_DETECT "carrier-detect"
 
 typedef struct {
 	NMSetting parent;
@@ -77,8 +76,6 @@ const GByteArray *nm_setting_infiniband_get_mac_address    (NMSettingInfiniband
 guint32           nm_setting_infiniband_get_mtu            (NMSettingInfiniband *setting);
 const char *      nm_setting_infiniband_get_transport_mode (NMSettingInfiniband *setting);
 
-const char *      nm_setting_infiniband_get_carrier_detect (NMSettingInfiniband *setting);
-
 G_END_DECLS
 
 #endif /* NM_SETTING_INFINIBAND_H */
diff --git a/libnm-util/nm-setting-vlan.c b/libnm-util/nm-setting-vlan.c
index d83030f17c..a0a25434b0 100644
--- a/libnm-util/nm-setting-vlan.c
+++ b/libnm-util/nm-setting-vlan.c
@@ -29,7 +29,6 @@
 #include "nm-setting-vlan.h"
 #include "nm-param-spec-specialized.h"
 #include "nm-utils.h"
-#include "nm-utils-private.h"
 #include "nm-dbus-glib-types.h"
 #include "nm-setting-connection.h"
 #include "nm-setting-private.h"
@@ -76,7 +75,6 @@ typedef struct {
 	guint32 flags;
 	GSList *ingress_priority_map;
 	GSList *egress_priority_map;
-	char *carrier_detect;
 } NMSettingVlanPrivate;
 
 enum {
@@ -87,7 +85,6 @@ enum {
 	PROP_FLAGS,
 	PROP_INGRESS_PRIORITY_MAP,
 	PROP_EGRESS_PRIORITY_MAP,
-	PROP_CARRIER_DETECT,
 	LAST_PROP
 };
 
@@ -437,21 +434,6 @@ nm_setting_vlan_clear_priorities (NMSettingVlan *setting, NMVlanPriorityMap map)
 	set_map (setting, map, NULL);
 }
 
-/**
- * nm_setting_vlan_get_carrier_detect:
- * @setting: the #NMSettingVlan
- *
- * Returns: the connection's carrier-detection behavior;
- *   See #NMSettingVlan:carrier-detect.
- **/
-const char *
-nm_setting_vlan_get_carrier_detect (NMSettingVlan *setting)
-{
-	g_return_val_if_fail (NM_IS_SETTING_VLAN (setting), NULL);
-
-	return NM_SETTING_VLAN_GET_PRIVATE (setting)->carrier_detect;
-}
-
 /*********************************************************************/
 
 static void
@@ -547,16 +529,6 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
 		return FALSE;
 	}
 
-	if (priv->carrier_detect && !_nm_utils_carrier_detect_mode_valid (priv->carrier_detect)) {
-		g_set_error (error,
-		             NM_SETTING_VLAN_ERROR,
-		             NM_SETTING_VLAN_ERROR_INVALID_PROPERTY,
-		             _("'%s' is not a valid value for the property"),
-		             priv->carrier_detect);
-		g_prefix_error (error, "%s: ", NM_SETTING_VLAN_CARRIER_DETECT);
-		return FALSE;
-	}
-
 	return TRUE;
 }
 
@@ -613,10 +585,6 @@ set_property (GObject *object, guint prop_id,
 		priv->egress_priority_map =
 			priority_stringlist_to_maplist (NM_VLAN_EGRESS_MAP, g_value_get_boxed (value));
 		break;
-	case PROP_CARRIER_DETECT:
-		g_free (priv->carrier_detect);
-		priv->carrier_detect = g_value_dup_string (value);
-		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
 		break;
@@ -662,9 +630,6 @@ get_property (GObject *object, guint prop_id,
 	case PROP_EGRESS_PRIORITY_MAP:
 		g_value_take_boxed (value, priority_maplist_to_stringlist (priv->egress_priority_map));
 		break;
-	case PROP_CARRIER_DETECT:
-		g_value_set_string (value, nm_setting_vlan_get_carrier_detect (setting));
-		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
 		break;
@@ -679,7 +644,6 @@ finalize (GObject *object)
 
 	g_free (priv->iface_name);
 	g_free (priv->parent);
-	g_free (priv->carrier_detect);
 	nm_utils_slist_free (priv->ingress_priority_map, g_free);
 	nm_utils_slist_free (priv->egress_priority_map, g_free);
 }
@@ -817,28 +781,4 @@ nm_setting_vlan_class_init (NMSettingVlanClass *setting_class)
 		                            "'to' are unsigned integers, ie '7:3'.",
 		                            DBUS_TYPE_G_LIST_OF_STRING,
 		                            G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE));
-
-	/**
-	 * NMSettingVlan:carrier-detect:
-	 *
-	 * Controls whether device carrier affects this connection. Possible values
-	 * are 'no', meaning the connection completely ignores carrier; 'yes',
-	 * meaning the connection can only be activated if carrier is present,
-	 * and will be deactivated automatically if carrier is lost; and
-	 * 'on-activate', meaning the connection can only be activated if carrier
-	 * is present, but will not be deactivated if carrier is lost.
-	 **/
-	g_object_class_install_property
-		(object_class, PROP_CARRIER_DETECT,
-		 g_param_spec_string (NM_SETTING_VLAN_CARRIER_DETECT,
-		                      "Carrier-detect",
-		                      "Controls whether device carrier affects this connection. "
-		                      "Possible values are 'no', meaning the connection completely "
-		                      "ignores carrier; 'yes', meaning the connection can only be "
-		                      "activated if carrier is present, and will be deactivated "
-		                      "automatically if carrier is lost; and 'on-activate', meaning "
-		                      "the connection can only be activated if carrier is present, "
-		                      "but will not be deactivated if carrier is lost.",
-		                      "yes",
-		                      G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE));
 }
diff --git a/libnm-util/nm-setting-vlan.h b/libnm-util/nm-setting-vlan.h
index 68d63cd953..019c6da071 100644
--- a/libnm-util/nm-setting-vlan.h
+++ b/libnm-util/nm-setting-vlan.h
@@ -63,7 +63,6 @@ GQuark nm_setting_vlan_error_quark (void);
 #define NM_SETTING_VLAN_FLAGS                "flags"
 #define NM_SETTING_VLAN_INGRESS_PRIORITY_MAP "ingress-priority-map"
 #define NM_SETTING_VLAN_EGRESS_PRIORITY_MAP  "egress-priority-map"
-#define NM_SETTING_VLAN_CARRIER_DETECT       "carrier-detect"
 
 typedef struct {
 	NMSetting parent;
@@ -143,8 +142,6 @@ gboolean nm_setting_vlan_add_priority_str   (NMSettingVlan *setting,
                                              NMVlanPriorityMap map,
                                              const char *str);
 
-const char * nm_setting_vlan_get_carrier_detect (NMSettingVlan *setting);
-
 G_END_DECLS
 
 #endif /* NM_SETTING_VLAN_H */
diff --git a/libnm-util/nm-setting-wired.c b/libnm-util/nm-setting-wired.c
index 2c24252d9a..0489896210 100644
--- a/libnm-util/nm-setting-wired.c
+++ b/libnm-util/nm-setting-wired.c
@@ -84,7 +84,6 @@ typedef struct {
 	GPtrArray *s390_subchannels;
 	char *s390_nettype;
 	GHashTable *s390_options;
-	char *carrier_detect;
 } NMSettingWiredPrivate;
 
 enum {
@@ -100,7 +99,6 @@ enum {
 	PROP_S390_SUBCHANNELS,
 	PROP_S390_NETTYPE,
 	PROP_S390_OPTIONS,
-	PROP_CARRIER_DETECT,
 
 	LAST_PROP
 };
@@ -440,21 +438,6 @@ nm_setting_wired_get_valid_s390_options (NMSettingWired *setting)
 	return valid_s390_opts;
 }
 
-/**
- * nm_setting_wired_get_carrier_detect:
- * @setting: the #NMSettingWired
- *
- * Returns: the connection's carrier-detection behavior;
- *   See #NMSettingWired:carrier-detect.
- **/
-const char *
-nm_setting_wired_get_carrier_detect (NMSettingWired *setting)
-{
-	g_return_val_if_fail (NM_IS_SETTING_WIRED (setting), NULL);
-
-	return NM_SETTING_WIRED_GET_PRIVATE (setting)->carrier_detect;
-}
-
 static gboolean
 verify (NMSetting *setting, GSList *all_settings, GError **error)
 {
@@ -553,16 +536,6 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
 		return FALSE;
 	}
 
-	if (priv->carrier_detect && !_nm_utils_carrier_detect_mode_valid (priv->carrier_detect)) {
-		g_set_error (error,
-		             NM_SETTING_WIRED_ERROR,
-		             NM_SETTING_WIRED_ERROR_INVALID_PROPERTY,
-		             _("'%s' is not a valid value for the property"),
-		             priv->carrier_detect);
-		g_prefix_error (error, "%s: ", NM_SETTING_WIRED_CARRIER_DETECT);
-		return FALSE;
-	}
-
 	return TRUE;
 }
 
@@ -583,7 +556,6 @@ finalize (GObject *object)
 	g_free (priv->port);
 	g_free (priv->duplex);
 	g_free (priv->s390_nettype);
-	g_free (priv->carrier_detect);
 
 	g_hash_table_destroy (priv->s390_options);
 
@@ -666,10 +638,6 @@ set_property (GObject *object, guint prop_id,
 		if (new_hash)
 			g_hash_table_foreach (new_hash, copy_hash, priv->s390_options);
 		break;
-	case PROP_CARRIER_DETECT:
-		g_free (priv->carrier_detect);
-		priv->carrier_detect = g_value_dup_string (value);
-		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
 		break;
@@ -717,9 +685,6 @@ get_property (GObject *object, guint prop_id,
 	case PROP_S390_OPTIONS:
 		g_value_set_boxed (value, priv->s390_options);
 		break;
-	case PROP_CARRIER_DETECT:
-		g_value_set_string (value, nm_setting_wired_get_carrier_detect (setting));
-		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
 		break;
@@ -939,29 +904,5 @@ nm_setting_wired_class_init (NMSettingWiredClass *setting_class)
 							   "'layer2', 'portname', 'protocol', among others.",
 							   DBUS_TYPE_G_MAP_OF_STRING,
 							   G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE));
-
-	/**
-	 * NMSettingWired:carrier-detect:
-	 *
-	 * Controls whether device carrier affects this connection. Possible values
-	 * are 'no', meaning the connection completely ignores carrier; 'yes',
-	 * meaning the connection can only be activated if carrier is present,
-	 * and will be deactivated automatically if carrier is lost; and
-	 * 'on-activate', meaning the connection can only be activated if carrier
-	 * is present, but will not be deactivated if carrier is lost.
-	 **/
-	g_object_class_install_property
-		(object_class, PROP_CARRIER_DETECT,
-		 g_param_spec_string (NM_SETTING_WIRED_CARRIER_DETECT,
-		                      "Carrier-detect",
-		                      "Controls whether device carrier affects this connection. "
-		                      "Possible values are 'no', meaning the connection completely "
-		                      "ignores carrier; 'yes', meaning the connection can only be "
-		                      "activated if carrier is present, and will be deactivated "
-		                      "automatically if carrier is lost; and 'on-activate', meaning "
-		                      "the connection can only be activated if carrier is present, "
-		                      "but will not be deactivated if carrier is lost.",
-		                      "yes",
-		                      G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE));
 }
 
diff --git a/libnm-util/nm-setting-wired.h b/libnm-util/nm-setting-wired.h
index a5f15a73a4..206bbeab0f 100644
--- a/libnm-util/nm-setting-wired.h
+++ b/libnm-util/nm-setting-wired.h
@@ -66,7 +66,6 @@ GQuark nm_setting_wired_error_quark (void);
 #define NM_SETTING_WIRED_S390_SUBCHANNELS "s390-subchannels"
 #define NM_SETTING_WIRED_S390_NETTYPE "s390-nettype"
 #define NM_SETTING_WIRED_S390_OPTIONS "s390-options"
-#define NM_SETTING_WIRED_CARRIER_DETECT "carrier-detect"
 
 typedef struct {
 	NMSetting parent;
@@ -111,8 +110,6 @@ gboolean          nm_setting_wired_remove_s390_option   (NMSettingWired *setting
                                                          const char *key);
 const char **     nm_setting_wired_get_valid_s390_options (NMSettingWired *setting);
 
-const char *      nm_setting_wired_get_carrier_detect   (NMSettingWired *setting);
-
 G_END_DECLS
 
 #endif /* NM_SETTING_WIRED_H */
diff --git a/libnm-util/nm-utils-private.h b/libnm-util/nm-utils-private.h
index 28fdfcb2de..2d179cf4d4 100644
--- a/libnm-util/nm-utils-private.h
+++ b/libnm-util/nm-utils-private.h
@@ -35,8 +35,6 @@ gboolean    _nm_utils_string_slist_validate (GSList *list,
 gboolean    _nm_utils_gvalue_array_validate (GValueArray *elements,
                                              guint n_expected, ...);
 
-gboolean    _nm_utils_carrier_detect_mode_valid (const char *carrier_detect);
-
 void        _nm_value_transforms_register (void);
 
 #endif
diff --git a/libnm-util/nm-utils.c b/libnm-util/nm-utils.c
index 7b93418703..0af67ec2a6 100644
--- a/libnm-util/nm-utils.c
+++ b/libnm-util/nm-utils.c
@@ -884,14 +884,6 @@ nm_utils_wpa_psk_valid (const char *psk)
 	return TRUE;
 }
 
-gboolean
-_nm_utils_carrier_detect_mode_valid (const char *carrier_detect)
-{
-	const char *valid_carrier_detect[] = { "no", "on-activate", "yes", NULL };
-
-	return _nm_utils_string_in_list (carrier_detect, valid_carrier_detect);
-}
-
 /**
  * nm_utils_ip4_addresses_from_gvalue:
  * @value: gvalue containing a GPtrArray of GArrays of guint32s
diff --git a/libnm-util/tests/test-general.c b/libnm-util/tests/test-general.c
index 0b6c685adf..a18c76ec51 100644
--- a/libnm-util/tests/test-general.c
+++ b/libnm-util/tests/test-general.c
@@ -1123,7 +1123,6 @@ test_connection_diff_a_only (void)
 			{ NM_SETTING_WIRED_S390_SUBCHANNELS,      NM_SETTING_DIFF_RESULT_IN_A },
 			{ NM_SETTING_WIRED_S390_NETTYPE,          NM_SETTING_DIFF_RESULT_IN_A },
 			{ NM_SETTING_WIRED_S390_OPTIONS,          NM_SETTING_DIFF_RESULT_IN_A },
-			{ NM_SETTING_WIRED_CARRIER_DETECT,        NM_SETTING_DIFF_RESULT_IN_A },
 			{ NULL, NM_SETTING_DIFF_RESULT_UNKNOWN },
 		} },
 		{ NM_SETTING_IP4_CONFIG_SETTING_NAME, {