summaryrefslogtreecommitdiff
path: root/src/nm-device-vlan.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/nm-device-vlan.c')
-rw-r--r--src/nm-device-vlan.c58
1 files changed, 29 insertions, 29 deletions
diff --git a/src/nm-device-vlan.c b/src/nm-device-vlan.c
index fe3548d7..a6542d62 100644
--- a/src/nm-device-vlan.c
+++ b/src/nm-device-vlan.c
@@ -100,7 +100,7 @@ nm_vlan_error_quark (void)
/******************************************************************/
static guint32
-real_get_generic_capabilities (NMDevice *dev)
+get_generic_capabilities (NMDevice *dev)
{
/* We assume VLAN interfaces always support carrier detect */
return NM_DEVICE_CAP_CARRIER_DETECT | NM_DEVICE_CAP_NM_SUPPORTED;
@@ -130,13 +130,13 @@ get_carrier_sync (NMDeviceVlan *self)
}
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)
{
gboolean success = FALSE, carrier;
guint i = 20;
@@ -163,13 +163,13 @@ real_hw_bring_up (NMDevice *dev, gboolean *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 void
-real_update_hw_address (NMDevice *dev)
+update_hw_address (NMDevice *dev)
{
NMDeviceVlan *self = NM_DEVICE_VLAN (dev);
NMDeviceVlanPrivate *priv = NM_DEVICE_VLAN_GET_PRIVATE (self);
@@ -209,14 +209,14 @@ out:
}
static gboolean
-real_can_interrupt_activation (NMDevice *dev)
+can_interrupt_activation (NMDevice *dev)
{
/* Can interrupt activation if the carrier drops while activating */
return NM_DEVICE_VLAN_GET_PRIVATE (dev)->carrier ? FALSE : TRUE;
}
static gboolean
-real_is_available (NMDevice *dev)
+is_available (NMDevice *dev)
{
return NM_DEVICE_VLAN_GET_PRIVATE (dev)->carrier ? TRUE : FALSE;
}
@@ -319,9 +319,9 @@ match_vlan_connection (NMDeviceVlan *self, NMConnection *connection, GError **er
}
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;
@@ -339,19 +339,19 @@ real_get_best_auto_connection (NMDevice *dev,
}
static gboolean
-real_check_connection_compatible (NMDevice *device,
- NMConnection *connection,
- GError **error)
+check_connection_compatible (NMDevice *device,
+ NMConnection *connection,
+ GError **error)
{
return match_vlan_connection (NM_DEVICE_VLAN (device), connection, error);
}
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)
{
NMDeviceVlanPrivate *priv = NM_DEVICE_VLAN_GET_PRIVATE (device);
NMSettingVlan *s_vlan;
@@ -758,17 +758,17 @@ nm_device_vlan_class_init (NMDeviceVlanClass *klass)
object_class->set_property = set_property;
object_class->dispose = dispose;
- parent_class->get_generic_capabilities = real_get_generic_capabilities;
- parent_class->update_hw_address = real_update_hw_address;
- 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->can_interrupt_activation = real_can_interrupt_activation;
- parent_class->is_available = real_is_available;
-
- 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->hw_is_up = hw_is_up;
+ parent_class->hw_bring_up = hw_bring_up;
+ parent_class->hw_take_down = hw_take_down;
+ parent_class->can_interrupt_activation = can_interrupt_activation;
+ parent_class->is_available = is_available;
+
+ 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->spec_match_list = spec_match_list;
parent_class->connection_match_config = connection_match_config;