diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2016-05-27 18:19:55 +0200 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2016-05-30 16:14:04 +0200 |
| commit | 02f935c4cc8d7df06d4e1f5acabd4ca8a60fd4d2 (patch) | |
| tree | f8736acf0273d80c8237fdb803a9320f5ab9645b | |
| parent | db771044cb93c6984980089329c85277f88d2f85 (diff) | |
| download | NetworkManager-02f935c4cc8d7df06d4e1f5acabd4ca8a60fd4d2.tar.gz | |
all: fix the identfier typo
| -rw-r--r-- | src/devices/nm-device.c | 2 | ||||
| -rw-r--r-- | src/nm-core-utils.c | 4 | ||||
| -rw-r--r-- | src/nm-core-utils.h | 4 | ||||
| -rw-r--r-- | src/ppp-manager/nm-ppp-manager.c | 2 | ||||
| -rw-r--r-- | src/rdisc/nm-rdisc.c | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index 103af24466..5151c9704f 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -5829,7 +5829,7 @@ check_and_add_ipv6ll_addr (NMDevice *self) } _LOGD (LOGD_IP6, "linklocal6: using EUI-64 identifier to generate IPv6LL address"); - nm_utils_ipv6_addr_set_interface_identfier (&lladdr, iid); + nm_utils_ipv6_addr_set_interface_identifier (&lladdr, iid); } _LOGD (LOGD_IP6, "linklocal6: adding IPv6LL address %s", nm_utils_inet6_ntop (&lladdr, NULL)); diff --git a/src/nm-core-utils.c b/src/nm-core-utils.c index 40081677df..5d6c74c57a 100644 --- a/src/nm-core-utils.c +++ b/src/nm-core-utils.c @@ -2867,14 +2867,14 @@ nm_utils_get_ipv6_interface_identifier (NMLinkType link_type, return FALSE; } void -nm_utils_ipv6_addr_set_interface_identfier (struct in6_addr *addr, +nm_utils_ipv6_addr_set_interface_identifier (struct in6_addr *addr, const NMUtilsIPv6IfaceId iid) { memcpy (addr->s6_addr + 8, &iid.id_u8, 8); } void -nm_utils_ipv6_interface_identfier_get_from_addr (NMUtilsIPv6IfaceId *iid, +nm_utils_ipv6_interface_identifier_get_from_addr (NMUtilsIPv6IfaceId *iid, const struct in6_addr *addr) { memcpy (iid, addr->s6_addr + 8, 8); diff --git a/src/nm-core-utils.h b/src/nm-core-utils.h index 7a0f909bc4..8b54113cb3 100644 --- a/src/nm-core-utils.h +++ b/src/nm-core-utils.h @@ -341,7 +341,7 @@ gboolean nm_utils_get_ipv6_interface_identifier (NMLinkType link_type, guint dev_id, NMUtilsIPv6IfaceId *out_iid); -void nm_utils_ipv6_addr_set_interface_identfier (struct in6_addr *addr, +void nm_utils_ipv6_addr_set_interface_identifier (struct in6_addr *addr, const NMUtilsIPv6IfaceId iid); gboolean nm_utils_ipv6_addr_set_stable_privacy (struct in6_addr *addr, @@ -350,7 +350,7 @@ gboolean nm_utils_ipv6_addr_set_stable_privacy (struct in6_addr *addr, guint dad_counter, GError **error); -void nm_utils_ipv6_interface_identfier_get_from_addr (NMUtilsIPv6IfaceId *iid, +void nm_utils_ipv6_interface_identifier_get_from_addr (NMUtilsIPv6IfaceId *iid, const struct in6_addr *addr); void nm_utils_array_remove_at_indexes (GArray *array, const guint *indexes_to_delete, gsize len); diff --git a/src/ppp-manager/nm-ppp-manager.c b/src/ppp-manager/nm-ppp-manager.c index b8860b9eb0..a51f7cfa6c 100644 --- a/src/ppp-manager/nm-ppp-manager.c +++ b/src/ppp-manager/nm-ppp-manager.c @@ -540,7 +540,7 @@ iid_value_to_ll6_addr (GVariant *dict, out_addr->s6_addr16[0] = htons (0xfe80); memcpy (out_addr->s6_addr + 8, &iid, sizeof (iid)); if (out_iid) - nm_utils_ipv6_interface_identfier_get_from_addr (out_iid, out_addr); + nm_utils_ipv6_interface_identifier_get_from_addr (out_iid, out_addr); return TRUE; } diff --git a/src/rdisc/nm-rdisc.c b/src/rdisc/nm-rdisc.c index 12e3962b0d..85c803dc79 100644 --- a/src/rdisc/nm-rdisc.c +++ b/src/rdisc/nm-rdisc.c @@ -161,7 +161,7 @@ complete_address (NMRDisc *rdisc, NMRDiscAddress *addr) if (addr->address.s6_addr32[2] == 0x0 && addr->address.s6_addr32[3] == 0x0) { _LOGD ("complete-address: adding an EUI-64 address"); - nm_utils_ipv6_addr_set_interface_identfier (&addr->address, rdisc->iid); + nm_utils_ipv6_addr_set_interface_identifier (&addr->address, rdisc->iid); return TRUE; } |