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

device: let infiniband prefer permanent MAC address for infiniband.mac-address setting

Browse source 
Note that usually for infiniband we cannot get a permanent MAC address
via ethtool. Thus, nm_device_get_permanent_hw_address() will return the
current address due to fallback_fake=TRUE.
This commit is contained in:
Thomas Haller 2016-06-15 14:11:16 +02:00
parent cc4371ef56
commit f578b91a5c
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/devices/nm-device-infiniband.c
View file

@ -147,10 +147,15 @@ check_connection_compatible (NMDevice *device, NMConnection *connection)
if (nm_device_is_real (device)) { if (nm_device_is_real (device)) {
const char *mac; const char *mac;
const char *hw_addr;
mac = nm_setting_infiniband_get_mac_address (s_infiniband); mac = nm_setting_infiniband_get_mac_address (s_infiniband);
if (mac && !nm_utils_hwaddr_matches (mac, -1, nm_device_get_hw_address (device), -1)) if (mac) {
return FALSE; hw_addr = nm_device_get_permanent_hw_address (device, TRUE);
if ( !hw_addr
|| !nm_utils_hwaddr_matches (mac, -1, hw_addr, -1))
return FALSE;
}
} }
return TRUE; return TRUE;
@ -183,7 +188,7 @@ complete_connection (NMDevice *device,
} }
setting_mac = nm_setting_infiniband_get_mac_address (s_infiniband); setting_mac = nm_setting_infiniband_get_mac_address (s_infiniband);
hw_address = nm_device_get_hw_address (device); hw_address = nm_device_get_permanent_hw_address (device, TRUE);
if (setting_mac) { if (setting_mac) {
/* Make sure the setting MAC (if any) matches the device's MAC */ /* Make sure the setting MAC (if any) matches the device's MAC */
if (!nm_utils_hwaddr_matches (setting_mac, -1, hw_address, -1)) { if (!nm_utils_hwaddr_matches (setting_mac, -1, hw_address, -1)) {
@ -209,7 +214,7 @@ static void
update_connection (NMDevice *device, NMConnection *connection) update_connection (NMDevice *device, NMConnection *connection)
{ {
NMSettingInfiniband *s_infiniband = nm_connection_get_setting_infiniband (connection); NMSettingInfiniband *s_infiniband = nm_connection_get_setting_infiniband (connection);
const char *mac = nm_device_get_hw_address (device); const char *mac = nm_device_get_permanent_hw_address (device, TRUE);
const char *transport_mode = "datagram"; const char *transport_mode = "datagram";
int ifindex; int ifindex;