diff options
author | Dan Winship <danw@gnome.org> | 2014-08-07 10:47:56 -0400 |
---|---|---|
committer | Dan Winship <danw@gnome.org> | 2014-09-04 09:18:43 -0400 |
commit | 7314256b77de1ffee2029e1e409de87d8e260621 (patch) | |
tree | f54680a566655cd6a812de1663852da323bd2163 /libnm-core/nm-setting-vlan.c | |
parent | 608b13e797af842f7fa18cfea1fececd3f19be85 (diff) | |
download | NetworkManager-7314256b77de1ffee2029e1e409de87d8e260621.tar.gz |
libnm-core: drop nm_{setting,connection}_get_virtual_iface_name()
Since we enforce the fact that bond, bridge, team, and vlan
interface-name properties match NMSettingConnection:interface-name,
nm_connection_get_virtual_iface_name() can be replaced with
nm_connection_get_interface_name() basically everywhere.
The one place this doesn't work is with InfiniBand partitions (where
get_virtual_iface_name() was actually computing the name), but for the
most part we only need to care about the interface names of InfiniBand
partitions in places where we also already need to do some other
InfiniBand-specific handling as well, so we can use an
InfiniBand-specific method
(nm_setting_infiniband_get_virtual_interface_name()) to get it.
(Also, while updating nm_device_get_virtual_device_description(), fix
it to handle InfiniBand partitions too.)
Diffstat (limited to 'libnm-core/nm-setting-vlan.c')
-rw-r--r-- | libnm-core/nm-setting-vlan.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/libnm-core/nm-setting-vlan.c b/libnm-core/nm-setting-vlan.c index 22fb2d7403..d977f6b2dd 100644 --- a/libnm-core/nm-setting-vlan.c +++ b/libnm-core/nm-setting-vlan.c @@ -602,12 +602,6 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) all_settings, error); } -static const char * -get_virtual_iface_name (NMSetting *setting) -{ - return nm_setting_vlan_get_interface_name (NM_SETTING_VLAN (setting)); -} - static GSList * priority_stringlist_to_maplist (NMVlanPriorityMap map, GSList *strlist) { @@ -733,7 +727,6 @@ nm_setting_vlan_class_init (NMSettingVlanClass *setting_class) object_class->get_property = get_property; object_class->finalize = finalize; parent_class->verify = verify; - parent_class->get_virtual_iface_name = get_virtual_iface_name; /* Properties */ |