colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

core: s/obtain/update for permanant HW address

Browse Source
This commit is contained in:
Dan Williams
2010-06-24 14:21:49 -07:00
parent dc02eee652
commit 3beea85a0b
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/nm-device-ethernet.c
View File

@@ -545,7 +545,7 @@ out:
} }
static void static void
real_obtain_permanent_hw_address (NMDevice *dev) real_update_permanent_hw_address (NMDevice *dev)
{ {
NMDeviceEthernet *self = NM_DEVICE_ETHERNET (dev); NMDeviceEthernet *self = NM_DEVICE_ETHERNET (dev);
NMDeviceEthernetPrivate *priv = NM_DEVICE_ETHERNET_GET_PRIVATE (self); NMDeviceEthernetPrivate *priv = NM_DEVICE_ETHERNET_GET_PRIVATE (self);
@@ -1932,7 +1932,7 @@ nm_device_ethernet_class_init (NMDeviceEthernetClass *klass)
parent_class->take_down = real_take_down; parent_class->take_down = real_take_down;
parent_class->can_interrupt_activation = real_can_interrupt_activation; parent_class->can_interrupt_activation = real_can_interrupt_activation;
parent_class->update_hw_address = real_update_hw_address; parent_class->update_hw_address = real_update_hw_address;
parent_class->obtain_permanent_hw_address = real_obtain_permanent_hw_address; parent_class->update_permanent_hw_address = real_update_permanent_hw_address;
parent_class->get_best_auto_connection = real_get_best_auto_connection; parent_class->get_best_auto_connection = real_get_best_auto_connection;
parent_class->is_available = real_is_available; parent_class->is_available = real_is_available;
parent_class->connection_secrets_updated = real_connection_secrets_updated; parent_class->connection_secrets_updated = real_connection_secrets_updated;

4
src/nm-device-wifi.c
View File

@@ -2992,7 +2992,7 @@ out:
} }
static void static void
real_obtain_permanent_hw_address (NMDevice *dev) real_update_permanent_hw_address (NMDevice *dev)
{ {
NMDeviceWifi *self = NM_DEVICE_WIFI (dev); NMDeviceWifi *self = NM_DEVICE_WIFI (dev);
NMDeviceWifiPrivate *priv = NM_DEVICE_WIFI_GET_PRIVATE (self); NMDeviceWifiPrivate *priv = NM_DEVICE_WIFI_GET_PRIVATE (self);
@@ -3878,7 +3878,7 @@ nm_device_wifi_class_init (NMDeviceWifiClass *klass)
parent_class->bring_up = real_bring_up; parent_class->bring_up = real_bring_up;
parent_class->take_down = real_take_down; parent_class->take_down = real_take_down;
parent_class->update_hw_address = real_update_hw_address; parent_class->update_hw_address = real_update_hw_address;
parent_class->obtain_permanent_hw_address = real_obtain_permanent_hw_address; parent_class->update_permanent_hw_address = real_update_permanent_hw_address;
parent_class->get_best_auto_connection = real_get_best_auto_connection; parent_class->get_best_auto_connection = real_get_best_auto_connection;
parent_class->is_available = real_is_available; parent_class->is_available = real_is_available;
parent_class->connection_secrets_updated = real_connection_secrets_updated; parent_class->connection_secrets_updated = real_connection_secrets_updated;

4
src/nm-device.c
View File

@@ -283,8 +283,8 @@ constructor (GType type,
if (NM_DEVICE_GET_CLASS (dev)->update_hw_address) if (NM_DEVICE_GET_CLASS (dev)->update_hw_address)
NM_DEVICE_GET_CLASS (dev)->update_hw_address (dev); NM_DEVICE_GET_CLASS (dev)->update_hw_address (dev);
if (NM_DEVICE_GET_CLASS (dev)->obtain_permanent_hw_address) if (NM_DEVICE_GET_CLASS (dev)->update_permanent_hw_address)
NM_DEVICE_GET_CLASS (dev)->obtain_permanent_hw_address (dev); NM_DEVICE_GET_CLASS (dev)->update_permanent_hw_address (dev);
priv->dhcp_manager = nm_dhcp_manager_get (); priv->dhcp_manager = nm_dhcp_manager_get ();

2
src/nm-device.h
View File

@@ -72,7 +72,7 @@ typedef struct {
void (*take_down) (NMDevice *self); void (*take_down) (NMDevice *self);
void (* update_hw_address) (NMDevice *self); void (* update_hw_address) (NMDevice *self);
void (* obtain_permanent_hw_address) (NMDevice *self); void (* update_permanent_hw_address) (NMDevice *self);
guint32 (* get_type_capabilities) (NMDevice *self); guint32 (* get_type_capabilities) (NMDevice *self);
guint32 (* get_generic_capabilities) (NMDevice *self); guint32 (* get_generic_capabilities) (NMDevice *self);