fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-01 01:20:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

platform: use driver name to detect IBM z-System CTC devices (rh #1212118)

Browse source 
We used to detect CTC devices according to the interface name. But that does
not work anymore due to systemd renaming the devices.
Let's use driver name for the detection instead. The driver is called 'ctcm'.

http://www-01.ibm.com/support/knowledgecenter/linuxonibm/com.ibm.linux.z.lgdd/lgdd_r_mpc_setup.html

https://bugzilla.redhat.com/show_bug.cgi?id=1212118

(cherry picked from commit 02c6a93343)
This commit is contained in:
Jiří Klimeš 2015-04-20 14:14:36 +02:00
parent 7028c8a53f
commit a658561be9
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/platform/nm-linux-platform.c
View file

@ -872,16 +872,15 @@ link_extract_type (NMPlatform *platform, struct rtnl_link *rtnllink, const char
if (!ifname)
return_type (NM_LINK_TYPE_UNKNOWN, type);
driver = ethtool_get_driver (ifname);
if (arptype == 256) {
/* Some s390 CTC-type devices report 256 for the encapsulation type
* for some reason, but we need to call them Ethernet. FIXME: use
* something other than interface name to detect CTC here.
* for some reason, but we need to call them Ethernet.
*/
if (g_str_has_prefix (ifname, "ctc"))
if (!g_strcmp0 (driver, "ctcm"))
return_type (NM_LINK_TYPE_ETHERNET, "ethernet");
}
driver = ethtool_get_driver (ifname);
if (!g_strcmp0 (driver, "openvswitch"))
return_type (NM_LINK_TYPE_OPENVSWITCH, "openvswitch");