diff options
Diffstat (limited to 'libnm-util/nm-setting-infiniband.c')
| -rw-r--r-- | libnm-util/nm-setting-infiniband.c | 59 |
1 files changed, 0 insertions, 59 deletions
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)); } |