diff options
| author | Thomas Haller <thaller@redhat.com> | 2019-08-22 09:57:55 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2019-08-28 16:27:00 +0200 |
| commit | e034cc326470df3b2f192254195bbb753eadd4ac (patch) | |
| tree | ac1623517650724dd3ea908a63c23117b0c519d2 /src | |
| parent | 2d40b7ba61590c700eb146f2a07fb14751d82ab8 (diff) | |
| download | NetworkManager-e034cc326470df3b2f192254195bbb753eadd4ac.tar.gz | |
device: let NMDevice set hardware address instead of act_stage1_prepare() for NMDeviceEthernet
There is a small change in the order of actions. Now we set the MAC address before
calling link_negotiation_set(). That shouldn't make a difference.
Diffstat (limited to 'src')
| -rw-r--r-- | src/devices/nm-device-ethernet.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/devices/nm-device-ethernet.c b/src/devices/nm-device-ethernet.c index d5fd155181..b69669ca6f 100644 --- a/src/devices/nm-device-ethernet.c +++ b/src/devices/nm-device-ethernet.c @@ -864,9 +864,6 @@ act_stage1_prepare (NMDevice *device, NMDeviceStateReason *out_failure_reason) link_negotiation_set (device); - if (!nm_device_hw_addr_set_cloned (device, nm_device_get_applied_connection (device), FALSE)) - return NM_ACT_STAGE_RETURN_FAILURE; - /* If we're re-activating a PPPoE connection a short while after * a previous PPPoE connection was torn down, wait a bit to allow the * remote side to handle the disconnection. Otherwise the peer may @@ -1771,6 +1768,7 @@ nm_device_ethernet_class_init (NMDeviceEthernetClass *klass) device_class->new_default_connection = new_default_connection; device_class->act_stage1_prepare = act_stage1_prepare; + device_class->act_stage1_prepare_set_hwaddr_ethernet = TRUE; device_class->act_stage2_config = act_stage2_config; device_class->act_stage3_ip_config_start = act_stage3_ip_config_start; device_class->get_configured_mtu = get_configured_mtu; |