colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

linux-platform: treat gadget devices as ethernet devices

Browse Source 
Also, don't manage them by default. Whatver created it should take care of
management.
This commit is contained in:
Lubomir Rintel
2016-01-20 12:45:21 +01:00
parent bf54a5bfba
commit c1cf3c25c8
2 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
data/85-nm-unmanaged.rules
View File

@@ -26,4 +26,9 @@ ATTR{address}=="00:1c:42:*", ENV{INTERFACE}=="vnic[0-9]*", ENV{NM_UNMANAGED}="1"
# in another net namespace and managed by libvirt, Docker or the like. # in another net namespace and managed by libvirt, Docker or the like.
ENV{ID_NET_DRIVER}=="veth", ENV{NM_UNMANAGED}="1" ENV{ID_NET_DRIVER}=="veth", ENV{NM_UNMANAGED}="1"
# USB gadget device. Unmanage by default, since whatever created it
# might want to set it up itself (e.g. activate an ipv4.method=shared
# connection).
ENV{DEVTYPE}=="gadget", ENV{NM_UNMANAGED}="1"
LABEL="nm_unmanaged_end" LABEL="nm_unmanaged_end"

20
src/platform/nm-linux-platform.c
View File

@@ -732,13 +732,19 @@ _linktype_get_type (NMPlatform *platform,
if (wifi_utils_is_wifi (ifname, sysfs_path)) if (wifi_utils_is_wifi (ifname, sysfs_path))
return NM_LINK_TYPE_WIFI; return NM_LINK_TYPE_WIFI;
/* Standard wired ethernet interfaces don't report an rtnl_link_type, so if (arptype == ARPHRD_ETHER) {
* only allow fallback to Ethernet if no type is given. This should /* Standard wired ethernet interfaces don't report an rtnl_link_type, so
* prevent future virtual network drivers from being treated as Ethernet * only allow fallback to Ethernet if no type is given. This should
* when they should be Generic instead. * prevent future virtual network drivers from being treated as Ethernet
*/ * when they should be Generic instead.
if (arptype == ARPHRD_ETHER && !kind && !devtype) */
return NM_LINK_TYPE_ETHERNET; if (!kind && !devtype)
return NM_LINK_TYPE_ETHERNET;
/* The USB gadget interfaces behave and look like ordinary ethernet devices
* aside from the DEVTYPE. */
if (!g_strcmp0 (devtype, "gadget"))
return NM_LINK_TYPE_ETHERNET;
}
} }
return NM_LINK_TYPE_UNKNOWN; return NM_LINK_TYPE_UNKNOWN;