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.h | |
| 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.h')
| -rw-r--r-- | libnm-core/nm-setting.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/libnm-core/nm-setting.h b/libnm-core/nm-setting.h index deb894e892..c2fef09f1b 100644 --- a/libnm-core/nm-setting.h +++ b/libnm-core/nm-setting.h @@ -205,8 +205,6 @@ typedef struct { const GParamSpec *prop_spec, NMSettingCompareFlags flags); - const char *(*get_virtual_iface_name) (NMSetting *setting); - /*< private >*/ gpointer padding[8]; } NMSettingClass; @@ -289,8 +287,6 @@ gboolean nm_setting_set_secret_flags (NMSetting *setting, NMSettingSecretFlags flags, GError **error); -const char *nm_setting_get_virtual_iface_name (NMSetting *setting); - G_END_DECLS #endif /* __NM_SETTING_H__ */ |