diff options
| author | Thomas Haller <thaller@redhat.com> | 2015-10-16 18:24:12 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2015-11-02 13:57:01 +0100 |
| commit | 9a3cdecdec441e40d85fae8ace9e405a786998a7 (patch) | |
| tree | c3cd8f49eca1244840ab3fd1bea301db5c06b363 | |
| parent | 7cdbc393a078f53ae8d45d3b794fa1fb199f7dd5 (diff) | |
| download | NetworkManager-9a3cdecdec441e40d85fae8ace9e405a786998a7.tar.gz | |
platform/trivial: rename nm_platform_infiniband_get_info() to get_properties()
We already have nm_platform_tun_get_properties(). Rename the function
as they both sidestep the platform cache to lookup some link-specific
properties.
| -rw-r--r-- | src/devices/nm-device-infiniband.c | 2 | ||||
| -rw-r--r-- | src/platform/nm-platform.c | 10 | ||||
| -rw-r--r-- | src/platform/nm-platform.h | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/devices/nm-device-infiniband.c b/src/devices/nm-device-infiniband.c index 05bf0323af..a647245f63 100644 --- a/src/devices/nm-device-infiniband.c +++ b/src/devices/nm-device-infiniband.c @@ -226,7 +226,7 @@ update_connection (NMDevice *device, NMConnection *connection) ifindex = nm_device_get_ifindex (device); if (ifindex > 0) { - if (!nm_platform_infiniband_get_info (NM_PLATFORM_GET, ifindex, NULL, NULL, &transport_mode)) + if (!nm_platform_infiniband_get_properties (NM_PLATFORM_GET, ifindex, NULL, NULL, &transport_mode)) transport_mode = "datagram"; } g_object_set (G_OBJECT (s_infiniband), NM_SETTING_INFINIBAND_TRANSPORT_MODE, transport_mode, NULL); diff --git a/src/platform/nm-platform.c b/src/platform/nm-platform.c index 8576b2ddff..6158f890ec 100644 --- a/src/platform/nm-platform.c +++ b/src/platform/nm-platform.c @@ -1621,11 +1621,11 @@ nm_platform_infiniband_partition_add (NMPlatform *self, int parent, int p_key, N } gboolean -nm_platform_infiniband_get_info (NMPlatform *self, - int ifindex, - int *out_parent, - int *out_p_key, - const char **out_mode) +nm_platform_infiniband_get_properties (NMPlatform *self, + int ifindex, + int *out_parent, + int *out_p_key, + const char **out_mode) { const NMPlatformLnkInfiniband *plnk; const NMPlatformLink *plink; diff --git a/src/platform/nm-platform.h b/src/platform/nm-platform.h index 21581d73e9..1bdf2fb612 100644 --- a/src/platform/nm-platform.h +++ b/src/platform/nm-platform.h @@ -693,7 +693,7 @@ gboolean nm_platform_vlan_set_ingress_map (NMPlatform *self, int ifindex, int fr gboolean nm_platform_vlan_set_egress_map (NMPlatform *self, int ifindex, int from, int to); NMPlatformError nm_platform_infiniband_partition_add (NMPlatform *self, int parent, int p_key, NMPlatformLink *out_link); -gboolean nm_platform_infiniband_get_info (NMPlatform *self, int ifindex, int *parent, int *p_key, const char **mode); +gboolean nm_platform_infiniband_get_properties (NMPlatform *self, int ifindex, int *parent, int *p_key, const char **mode); gboolean nm_platform_veth_get_properties (NMPlatform *self, int ifindex, int *out_peer_ifindex); gboolean nm_platform_tun_get_properties (NMPlatform *self, int ifindex, NMPlatformTunProperties *properties); |