diff options
Diffstat (limited to 'src/nm-device-infiniband.c')
| -rw-r--r-- | src/nm-device-infiniband.c | 50 |
1 files changed, 24 insertions, 26 deletions
diff --git a/src/nm-device-infiniband.c b/src/nm-device-infiniband.c index 5e43f060..b2915f9e 100644 --- a/src/nm-device-infiniband.c +++ b/src/nm-device-infiniband.c @@ -122,7 +122,7 @@ nm_device_infiniband_new (const char *udi, static void -real_update_hw_address (NMDevice *dev) +update_hw_address (NMDevice *dev) { const guint8 *hw_addr; guint8 old_addr[INFINIBAND_ALEN]; @@ -138,15 +138,15 @@ real_update_hw_address (NMDevice *dev) } static guint32 -real_get_generic_capabilities (NMDevice *dev) +get_generic_capabilities (NMDevice *dev) { return NM_DEVICE_CAP_CARRIER_DETECT | NM_DEVICE_CAP_NM_SUPPORTED; } static NMConnection * -real_get_best_auto_connection (NMDevice *dev, - GSList *connections, - char **specific_object) +get_best_auto_connection (NMDevice *dev, + GSList *connections, + char **specific_object) { GSList *iter; @@ -182,13 +182,13 @@ real_get_best_auto_connection (NMDevice *dev, } static NMActStageReturn -real_act_stage1_prepare (NMDevice *dev, NMDeviceStateReason *reason) +act_stage1_prepare (NMDevice *dev, NMDeviceStateReason *reason) { NMActRequest *req; NMConnection *connection; NMSettingInfiniband *s_infiniband; const char *transport_mode; - char *mode_path, *mode_value; + char *mode_path; gboolean ok; g_return_val_if_fail (reason != NULL, NM_ACT_STAGE_RETURN_FAILURE); @@ -215,9 +215,7 @@ real_act_stage1_prepare (NMDevice *dev, NMDeviceStateReason *reason) } } - mode_value = g_strdup_printf ("%s\n", transport_mode); - ok = nm_utils_do_sysctl (mode_path, mode_value); - g_free (mode_value); + ok = nm_utils_do_sysctl (mode_path, transport_mode); g_free (mode_path); if (!ok) { @@ -229,7 +227,7 @@ real_act_stage1_prepare (NMDevice *dev, NMDeviceStateReason *reason) } static void -real_ip4_config_pre_commit (NMDevice *self, NMIP4Config *config) +ip4_config_pre_commit (NMDevice *self, NMIP4Config *config) { NMConnection *connection; NMSettingInfiniband *s_infiniband; @@ -247,9 +245,9 @@ real_ip4_config_pre_commit (NMDevice *self, NMIP4Config *config) } static gboolean -real_check_connection_compatible (NMDevice *device, - NMConnection *connection, - GError **error) +check_connection_compatible (NMDevice *device, + NMConnection *connection, + GError **error) { NMSettingInfiniband *s_infiniband; const GByteArray *mac; @@ -287,11 +285,11 @@ real_check_connection_compatible (NMDevice *device, } static gboolean -real_complete_connection (NMDevice *device, - NMConnection *connection, - const char *specific_object, - const GSList *existing_connections, - GError **error) +complete_connection (NMDevice *device, + NMConnection *connection, + const char *specific_object, + const GSList *existing_connections, + GError **error) { NMSettingInfiniband *s_infiniband; const GByteArray *setting_mac; @@ -476,14 +474,14 @@ nm_device_infiniband_class_init (NMDeviceInfinibandClass *klass) object_class->get_property = get_property; object_class->set_property = set_property; - parent_class->get_generic_capabilities = real_get_generic_capabilities; - parent_class->update_hw_address = real_update_hw_address; - parent_class->get_best_auto_connection = real_get_best_auto_connection; - parent_class->check_connection_compatible = real_check_connection_compatible; - parent_class->complete_connection = real_complete_connection; + parent_class->get_generic_capabilities = get_generic_capabilities; + parent_class->update_hw_address = update_hw_address; + parent_class->get_best_auto_connection = get_best_auto_connection; + parent_class->check_connection_compatible = check_connection_compatible; + parent_class->complete_connection = complete_connection; - parent_class->act_stage1_prepare = real_act_stage1_prepare; - parent_class->ip4_config_pre_commit = real_ip4_config_pre_commit; + parent_class->act_stage1_prepare = act_stage1_prepare; + parent_class->ip4_config_pre_commit = ip4_config_pre_commit; parent_class->spec_match_list = spec_match_list; parent_class->connection_match_config = connection_match_config; parent_class->hwaddr_matches = hwaddr_matches; |