fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-08 11:19:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

ethernet: don't set a hw address in a default connection

Browse source 
Use an ifname instead.

This also fixes creation of default wired connections for cheapo USB
ethernet adapters that come with the EEPROM footprint unpopulated.

https://gitlab.freedesktop.org/NetworkManager/NetworkManager/merge_requests/137/
This commit is contained in:
Lubomir Rintel 2019-05-07 11:03:19 +02:00
parent 3c54b5eb2b
commit 393dee9c0e
1 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/devices/nm-device-ethernet.c
View file

@ -1430,6 +1430,7 @@ new_default_connection (NMDevice *self)
gs_unref_hashtable GHashTable *existing_ids = NULL; gs_unref_hashtable GHashTable *existing_ids = NULL;
struct udev_device *dev; struct udev_device *dev;
const char *perm_hw_addr; const char *perm_hw_addr;
const char *iface;
const char *uprop = "0"; const char *uprop = "0";
gs_free char *defname = NULL; gs_free char *defname = NULL;
gs_free char *uuid = NULL; gs_free char *uuid = NULL;
@ -1439,8 +1440,7 @@ new_default_connection (NMDevice *self)
return NULL; return NULL;
perm_hw_addr = nm_device_get_permanent_hw_address (self); perm_hw_addr = nm_device_get_permanent_hw_address (self);
if (!perm_hw_addr) iface = nm_device_get_iface (self);
return NULL;
connection = nm_simple_connection_new (); connection = nm_simple_connection_new ();
setting = nm_setting_connection_new (); setting = nm_setting_connection_new ();
@ -1461,7 +1461,7 @@ new_default_connection (NMDevice *self)
uuid = _nm_utils_uuid_generate_from_strings ("default-wired", uuid = _nm_utils_uuid_generate_from_strings ("default-wired",
nm_utils_machine_id_str (), nm_utils_machine_id_str (),
defname, defname,
perm_hw_addr, perm_hw_addr ?: iface,
NULL); NULL);
g_object_set (setting, g_object_set (setting,
@ -1471,13 +1471,9 @@ new_default_connection (NMDevice *self)
NM_SETTING_CONNECTION_AUTOCONNECT_PRIORITY, NM_SETTING_CONNECTION_AUTOCONNECT_PRIORITY_MIN, NM_SETTING_CONNECTION_AUTOCONNECT_PRIORITY, NM_SETTING_CONNECTION_AUTOCONNECT_PRIORITY_MIN,
NM_SETTING_CONNECTION_UUID, uuid, NM_SETTING_CONNECTION_UUID, uuid,
NM_SETTING_CONNECTION_TIMESTAMP, (guint64) time (NULL), NM_SETTING_CONNECTION_TIMESTAMP, (guint64) time (NULL),
NM_SETTING_CONNECTION_INTERFACE_NAME, iface,
NULL); NULL);
/* Lock the connection to the device */
setting = nm_setting_wired_new ();
g_object_set (setting, NM_SETTING_WIRED_MAC_ADDRESS, perm_hw_addr, NULL);
nm_connection_add_setting (connection, setting);
/* Check if we should create a Link-Local only connection */ /* Check if we should create a Link-Local only connection */
dev = nm_platform_link_get_udev_device (nm_device_get_platform (NM_DEVICE (self)), nm_device_get_ip_ifindex (self)); dev = nm_platform_link_get_udev_device (nm_device_get_platform (NM_DEVICE (self)), nm_device_get_ip_ifindex (self));
if (dev) if (dev)