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

platform: split link_type_from_udev()

Browse Source 
Also change link_extract_type() to accept NULL as @platform
argument.
This commit is contained in:
Thomas Haller
2015-04-14 10:08:12 +02:00
parent d695776d48
commit 34d82d0df1
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -797,15 +797,12 @@ type_to_string (NMLinkType type)
} G_STMT_END } G_STMT_END
static NMLinkType static NMLinkType
link_type_from_udev (NMPlatform *platform, int ifindex, const char *ifname, int arptype, const char **out_name) udev_detect_link_type_from_device (GUdevDevice *udev_device, const char *ifname, int arptype, const char **out_name)
{ {
NMLinuxPlatformPrivate *priv = NM_LINUX_PLATFORM_GET_PRIVATE (platform);
GUdevDevice *udev_device;
const char *prop, *sysfs_path; const char *prop, *sysfs_path;
g_assert (ifname); g_assert (ifname);
udev_device = g_hash_table_lookup (priv->udev_devices, GINT_TO_POINTER (ifindex));
if (!udev_device) if (!udev_device)
return_type (NM_LINK_TYPE_UNKNOWN, "unknown"); return_type (NM_LINK_TYPE_UNKNOWN, "unknown");
@@ -872,6 +869,7 @@ link_extract_type (NMPlatform *platform, struct rtnl_link *rtnllink, const char
int arptype = rtnl_link_get_arptype (rtnllink); int arptype = rtnl_link_get_arptype (rtnllink);
const char *driver; const char *driver;
const char *ifname; const char *ifname;
GUdevDevice *udev_device = NULL;
if (arptype == ARPHRD_LOOPBACK) if (arptype == ARPHRD_LOOPBACK)
return_type (NM_LINK_TYPE_LOOPBACK, "loopback"); return_type (NM_LINK_TYPE_LOOPBACK, "loopback");
@@ -895,8 +893,11 @@ link_extract_type (NMPlatform *platform, struct rtnl_link *rtnllink, const char
if (!g_strcmp0 (driver, "openvswitch")) if (!g_strcmp0 (driver, "openvswitch"))
return_type (NM_LINK_TYPE_OPENVSWITCH, "openvswitch"); return_type (NM_LINK_TYPE_OPENVSWITCH, "openvswitch");
return link_type_from_udev (platform, if (platform) {
rtnl_link_get_ifindex (rtnllink), udev_device = g_hash_table_lookup (NM_LINUX_PLATFORM_GET_PRIVATE (platform)->udev_devices,
GINT_TO_POINTER (rtnl_link_get_ifindex (rtnllink)));
}
return udev_detect_link_type_from_device (udev_device,
ifname, ifname,
arptype, arptype,
out_name); out_name);