diff --git a/src/nm-device-ethernet.c b/src/nm-device-ethernet.c index 8a22b6b9b..2045ee7d7 100644 --- a/src/nm-device-ethernet.c +++ b/src/nm-device-ethernet.c @@ -545,7 +545,7 @@ out: } static void -real_obtain_permanent_hw_address (NMDevice *dev) +real_update_permanent_hw_address (NMDevice *dev) { NMDeviceEthernet *self = NM_DEVICE_ETHERNET (dev); 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->can_interrupt_activation = real_can_interrupt_activation; 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->is_available = real_is_available; parent_class->connection_secrets_updated = real_connection_secrets_updated; diff --git a/src/nm-device-wifi.c b/src/nm-device-wifi.c index 729dc0690..9aac25fa3 100644 --- a/src/nm-device-wifi.c +++ b/src/nm-device-wifi.c @@ -2992,7 +2992,7 @@ out: } static void -real_obtain_permanent_hw_address (NMDevice *dev) +real_update_permanent_hw_address (NMDevice *dev) { NMDeviceWifi *self = NM_DEVICE_WIFI (dev); 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->take_down = real_take_down; 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->is_available = real_is_available; parent_class->connection_secrets_updated = real_connection_secrets_updated; diff --git a/src/nm-device.c b/src/nm-device.c index 9981f9b44..fd46ee33e 100644 --- a/src/nm-device.c +++ b/src/nm-device.c @@ -283,8 +283,8 @@ constructor (GType type, if (NM_DEVICE_GET_CLASS (dev)->update_hw_address) NM_DEVICE_GET_CLASS (dev)->update_hw_address (dev); - if (NM_DEVICE_GET_CLASS (dev)->obtain_permanent_hw_address) - NM_DEVICE_GET_CLASS (dev)->obtain_permanent_hw_address (dev); + if (NM_DEVICE_GET_CLASS (dev)->update_permanent_hw_address) + NM_DEVICE_GET_CLASS (dev)->update_permanent_hw_address (dev); priv->dhcp_manager = nm_dhcp_manager_get (); diff --git a/src/nm-device.h b/src/nm-device.h index a2e074959..ca067f441 100644 --- a/src/nm-device.h +++ b/src/nm-device.h @@ -72,7 +72,7 @@ typedef struct { void (*take_down) (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_generic_capabilities) (NMDevice *self);