diff options
| author | Thomas Haller <thaller@redhat.com> | 2015-04-14 10:08:12 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2015-04-14 13:06:53 +0200 |
| commit | 34d82d0df19d73b30708dc4a3e9f8d91da3721c0 (patch) | |
| tree | ee8d2b3717ed70e2d7d789882125bca47332a7ab | |
| parent | d695776d484c7cbc2fdd398cf960c6521a026b1a (diff) | |
| download | NetworkManager-34d82d0df19d73b30708dc4a3e9f8d91da3721c0.tar.gz | |
platform: split link_type_from_udev()
Also change link_extract_type() to accept NULL as @platform
argument.
| -rw-r--r-- | src/platform/nm-linux-platform.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/src/platform/nm-linux-platform.c b/src/platform/nm-linux-platform.c index 7409c943bb..78164be424 100644 --- a/src/platform/nm-linux-platform.c +++ b/src/platform/nm-linux-platform.c @@ -797,15 +797,12 @@ type_to_string (NMLinkType type) } G_STMT_END 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; g_assert (ifname); - udev_device = g_hash_table_lookup (priv->udev_devices, GINT_TO_POINTER (ifindex)); if (!udev_device) 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); const char *driver; const char *ifname; + GUdevDevice *udev_device = NULL; if (arptype == ARPHRD_LOOPBACK) return_type (NM_LINK_TYPE_LOOPBACK, "loopback"); @@ -895,11 +893,14 @@ link_extract_type (NMPlatform *platform, struct rtnl_link *rtnllink, const char if (!g_strcmp0 (driver, "openvswitch")) return_type (NM_LINK_TYPE_OPENVSWITCH, "openvswitch"); - return link_type_from_udev (platform, - rtnl_link_get_ifindex (rtnllink), - ifname, - arptype, - out_name); + if (platform) { + 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, + arptype, + out_name); } else if (!strcmp (type, "dummy")) return_type (NM_LINK_TYPE_DUMMY, "dummy"); else if (!strcmp (type, "gre")) |