diff options
Diffstat (limited to 'src/nm-device-olpc-mesh.c')
| -rw-r--r-- | src/nm-device-olpc-mesh.c | 62 |
1 files changed, 31 insertions, 31 deletions
diff --git a/src/nm-device-olpc-mesh.c b/src/nm-device-olpc-mesh.c index 8e3cb952..3da0408e 100644 --- a/src/nm-device-olpc-mesh.c +++ b/src/nm-device-olpc-mesh.c @@ -117,7 +117,7 @@ nm_olpc_mesh_error_quark (void) } static guint32 -real_get_generic_capabilities (NMDevice *dev) +get_generic_capabilities (NMDevice *dev) { return NM_DEVICE_CAP_NM_SUPPORTED; } @@ -179,25 +179,25 @@ constructor (GType type, } static gboolean -real_hw_is_up (NMDevice *device) +hw_is_up (NMDevice *device) { return nm_system_iface_is_up (nm_device_get_ip_ifindex (device)); } static gboolean -real_hw_bring_up (NMDevice *dev, gboolean *no_firmware) +hw_bring_up (NMDevice *dev, gboolean *no_firmware) { return nm_system_iface_set_up (nm_device_get_ip_ifindex (dev), TRUE, no_firmware); } static void -real_hw_take_down (NMDevice *dev) +hw_take_down (NMDevice *dev) { nm_system_iface_set_up (nm_device_get_ip_ifindex (dev), FALSE, NULL); } static gboolean -real_is_up (NMDevice *device) +is_up (NMDevice *device) { NMDeviceOlpcMesh *self = NM_DEVICE_OLPC_MESH (device); NMDeviceOlpcMeshPrivate *priv = NM_DEVICE_OLPC_MESH_GET_PRIVATE (self); @@ -206,7 +206,7 @@ real_is_up (NMDevice *device) } static gboolean -real_bring_up (NMDevice *dev) +bring_up (NMDevice *dev) { NMDeviceOlpcMesh *self = NM_DEVICE_OLPC_MESH (dev); NMDeviceOlpcMeshPrivate *priv = NM_DEVICE_OLPC_MESH_GET_PRIVATE (self); @@ -228,15 +228,15 @@ device_cleanup (NMDeviceOlpcMesh *self) } static void -real_take_down (NMDevice *dev) +take_down (NMDevice *dev) { device_cleanup (NM_DEVICE_OLPC_MESH (dev)); } static gboolean -real_check_connection_compatible (NMDevice *device, - NMConnection *connection, - GError **error) +check_connection_compatible (NMDevice *device, + NMConnection *connection, + GError **error) { NMSettingConnection *s_con; NMSettingOlpcMesh *s_mesh; @@ -265,11 +265,11 @@ real_check_connection_compatible (NMDevice *device, #define DEFAULT_SSID "olpc-mesh" 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) { NMSettingOlpcMesh *s_mesh; GByteArray *tmp; @@ -327,7 +327,7 @@ nm_device_olpc_mesh_get_address (NMDeviceOlpcMesh *self, /****************************************************************************/ static void -real_update_hw_address (NMDevice *dev) +update_hw_address (NMDevice *dev) { NMDeviceOlpcMesh *self = NM_DEVICE_OLPC_MESH (dev); NMDeviceOlpcMeshPrivate *priv = NM_DEVICE_OLPC_MESH_GET_PRIVATE (self); @@ -360,7 +360,7 @@ out: static NMActStageReturn -real_act_stage1_prepare (NMDevice *dev, NMDeviceStateReason *reason) +act_stage1_prepare (NMDevice *dev, NMDeviceStateReason *reason) { NMDeviceOlpcMeshPrivate *priv = NM_DEVICE_OLPC_MESH_GET_PRIVATE (dev); gboolean scanning; @@ -402,7 +402,7 @@ _mesh_set_channel (NMDeviceOlpcMesh *self, guint32 channel) } static NMActStageReturn -real_act_stage2_config (NMDevice *dev, NMDeviceStateReason *reason) +act_stage2_config (NMDevice *dev, NMDeviceStateReason *reason) { NMDeviceOlpcMesh *self = NM_DEVICE_OLPC_MESH (dev); NMDeviceOlpcMeshPrivate *priv = NM_DEVICE_OLPC_MESH_GET_PRIVATE (self); @@ -510,19 +510,19 @@ nm_device_olpc_mesh_class_init (NMDeviceOlpcMeshClass *klass) object_class->dispose = dispose; parent_class->get_type_capabilities = NULL; - parent_class->get_generic_capabilities = real_get_generic_capabilities; - parent_class->hw_is_up = real_hw_is_up; - parent_class->hw_bring_up = real_hw_bring_up; - parent_class->hw_take_down = real_hw_take_down; - parent_class->is_up = real_is_up; - parent_class->bring_up = real_bring_up; - parent_class->take_down = real_take_down; - parent_class->update_hw_address = real_update_hw_address; - parent_class->check_connection_compatible = real_check_connection_compatible; - parent_class->complete_connection = real_complete_connection; - - parent_class->act_stage1_prepare = real_act_stage1_prepare; - parent_class->act_stage2_config = real_act_stage2_config; + parent_class->get_generic_capabilities = get_generic_capabilities; + parent_class->hw_is_up = hw_is_up; + parent_class->hw_bring_up = hw_bring_up; + parent_class->hw_take_down = hw_take_down; + parent_class->is_up = is_up; + parent_class->bring_up = bring_up; + parent_class->take_down = take_down; + parent_class->update_hw_address = update_hw_address; + parent_class->check_connection_compatible = check_connection_compatible; + parent_class->complete_connection = complete_connection; + + parent_class->act_stage1_prepare = act_stage1_prepare; + parent_class->act_stage2_config = act_stage2_config; /* Properties */ g_object_class_install_property |