diff options
| author | Thomas Haller <thaller@redhat.com> | 2018-02-02 12:07:17 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2018-02-07 13:37:12 +0100 |
| commit | 8b4f119272a474ba5c9fbbd6f3e212dd4169194d (patch) | |
| tree | 549692eec55bf66565110bbba0f7c6e3a6bdbed5 /src/nm-ip6-config.c | |
| parent | b680cdd06325a15ef3ca38caedcd53dd1525a5cd (diff) | |
| download | NetworkManager-8b4f119272a474ba5c9fbbd6f3e212dd4169194d.tar.gz | |
core: avoid IFA_F_TEMPORARY alias for IFA_F_SECONDARY
IFA_F_SECONDARY and IFA_F_TEMPORARY have the same numerical values,
and are synonymous. Consistently use IFA_F_SECONDARY.
Diffstat (limited to 'src/nm-ip6-config.c')
| -rw-r--r-- | src/nm-ip6-config.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/nm-ip6-config.c b/src/nm-ip6-config.c index 9d4255a520..692182e183 100644 --- a/src/nm-ip6-config.c +++ b/src/nm-ip6-config.c @@ -268,19 +268,19 @@ _addresses_sort_cmp (const NMPlatformIP6Address *a1, if (p1 != p2) return p1 > p2 ? -1 : 1; - ipv6_privacy1 = !!(a1->n_ifa_flags & (IFA_F_MANAGETEMPADDR | IFA_F_TEMPORARY)); - ipv6_privacy2 = !!(a2->n_ifa_flags & (IFA_F_MANAGETEMPADDR | IFA_F_TEMPORARY)); + ipv6_privacy1 = !!(a1->n_ifa_flags & (IFA_F_MANAGETEMPADDR | IFA_F_SECONDARY)); + ipv6_privacy2 = !!(a2->n_ifa_flags & (IFA_F_MANAGETEMPADDR | IFA_F_SECONDARY)); if (ipv6_privacy1 || ipv6_privacy2) { gboolean public1 = TRUE, public2 = TRUE; if (ipv6_privacy1) { - if (a1->n_ifa_flags & IFA_F_TEMPORARY) + if (a1->n_ifa_flags & IFA_F_SECONDARY) public1 = prefer_temp; else public1 = !prefer_temp; } if (ipv6_privacy2) { - if (a2->n_ifa_flags & IFA_F_TEMPORARY) + if (a2->n_ifa_flags & IFA_F_SECONDARY) public2 = prefer_temp; else public2 = !prefer_temp; |