diff options
| author | Thomas Haller <thaller@redhat.com> | 2018-12-13 12:55:51 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2018-12-19 09:05:12 +0100 |
| commit | 91b5babff2dcab7739b8002c16aec70921356f09 (patch) | |
| tree | 02cb2755bb2b2a60ff5cf73001b73c3b34e529fe | |
| parent | 18a99e8652452e5c31ce6e9796e7b0bf398be519 (diff) | |
| download | NetworkManager-91b5babff2dcab7739b8002c16aec70921356f09.tar.gz | |
core/trivial: rename nm_platform_sysctl_set_ip6_hop_limit_safe()
Now that we have other helper function on platfrom for setting
IP configuration sysctls, rename the function to set the hop-limit
to match the pattern.
| -rw-r--r-- | src/devices/nm-device.c | 2 | ||||
| -rw-r--r-- | src/nm-iface-helper.c | 2 | ||||
| -rw-r--r-- | src/platform/nm-platform.c | 4 | ||||
| -rw-r--r-- | src/platform/nm-platform.h | 4 |
4 files changed, 8 insertions, 4 deletions
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index 4e9ac076ff..2acbc554f3 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -9414,7 +9414,7 @@ ndisc_config_changed (NMNDisc *ndisc, const NMNDiscData *rdata, guint changed_in } if (changed & NM_NDISC_CONFIG_HOP_LIMIT) - nm_platform_sysctl_set_ip6_hop_limit_safe (nm_device_get_platform (self), nm_device_get_ip_iface (self), rdata->hop_limit); + nm_platform_sysctl_ip_conf_set_ipv6_hop_limit_safe (nm_device_get_platform (self), nm_device_get_ip_iface (self), rdata->hop_limit); if (changed & NM_NDISC_CONFIG_MTU) { if (priv->ip6_mtu != rdata->mtu) { diff --git a/src/nm-iface-helper.c b/src/nm-iface-helper.c index f79b930ec2..1229ad35cf 100644 --- a/src/nm-iface-helper.c +++ b/src/nm-iface-helper.c @@ -223,7 +223,7 @@ ndisc_config_changed (NMNDisc *ndisc, const NMNDiscData *rdata, guint changed_in } if (changed & NM_NDISC_CONFIG_HOP_LIMIT) - nm_platform_sysctl_set_ip6_hop_limit_safe (NM_PLATFORM_GET, global_opt.ifname, rdata->hop_limit); + nm_platform_sysctl_ip_conf_set_ipv6_hop_limit_safe (NM_PLATFORM_GET, global_opt.ifname, rdata->hop_limit); if (changed & NM_NDISC_CONFIG_MTU) { nm_platform_sysctl_ip_conf_set_int64 (NM_PLATFORM_GET, diff --git a/src/platform/nm-platform.c b/src/platform/nm-platform.c index 6adbb815ce..dd119b9970 100644 --- a/src/platform/nm-platform.c +++ b/src/platform/nm-platform.c @@ -476,7 +476,9 @@ nm_platform_sysctl_set (NMPlatform *self, const char *pathid, int dirfd, const c } gboolean -nm_platform_sysctl_set_ip6_hop_limit_safe (NMPlatform *self, const char *iface, int value) +nm_platform_sysctl_ip_conf_set_ipv6_hop_limit_safe (NMPlatform *self, + const char *iface, + int value) { const char *path; gint64 cur; diff --git a/src/platform/nm-platform.h b/src/platform/nm-platform.h index ece106bfe2..59d4eb45c5 100644 --- a/src/platform/nm-platform.h +++ b/src/platform/nm-platform.h @@ -1154,7 +1154,9 @@ gboolean nm_platform_sysctl_ip_conf_set_int64 (NMPlatform *platform, const char *property, gint64 value); -gboolean nm_platform_sysctl_set_ip6_hop_limit_safe (NMPlatform *self, const char *iface, int value); +gboolean nm_platform_sysctl_ip_conf_set_ipv6_hop_limit_safe (NMPlatform *self, + const char *iface, + int value); const char *nm_platform_if_indextoname (NMPlatform *self, int ifindex, char *out_ifname/* of size IFNAMSIZ */); int nm_platform_if_nametoindex (NMPlatform *self, const char *ifname); |