diff options
| author | Thomas Graf <tgraf@redhat.com> | 2011-11-09 11:22:39 +0100 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2011-11-09 23:24:04 -0600 |
| commit | d839e1c817193d821c4ac70e34b9255aa29016bd (patch) | |
| tree | 87d1425a3bd1cd08c0e088456f53b3b38175162e /src/nm-udev-manager.c | |
| parent | e654bb8d1de85c8a3422ed80630696b08a04c520 (diff) | |
| download | NetworkManager-d839e1c817193d821c4ac70e34b9255aa29016bd.tar.gz | |
core: convert nm_system_get_link_type() to return an int
Kills the strdup() and avoids having the caller free the memory. Also renames
the function to nm_system_get_iface_type() since "link" is not a common term
in NM.
Signed-off-by: Thomas Graf <tgraf@redhat.com>
Diffstat (limited to 'src/nm-udev-manager.c')
| -rw-r--r-- | src/nm-udev-manager.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/nm-udev-manager.c b/src/nm-udev-manager.c index 9ffb5f0080..8a519c0fb6 100644 --- a/src/nm-udev-manager.c +++ b/src/nm-udev-manager.c @@ -423,15 +423,15 @@ device_creator (NMUdevManager *manager, } if (!driver) { - char *type; - - type = nm_system_get_link_type (ifname); - if (type) { - if (g_strcmp0 (type, "bond") == 0) - driver = "bonding"; - g_free (type); - } else if (g_str_has_prefix (ifname, "easytether")) { - driver = "easytether"; + switch (nm_system_get_iface_type (ifname)) { + case NM_IFACE_TYPE_BOND: + driver = "bonding"; + break; + + default: + if (g_str_has_prefix (ifname, "easytether")) + driver = "easytether"; + break; } if (!driver) { |