diff options
author | Thomas Haller <thaller@redhat.com> | 2015-06-25 18:44:58 +0200 |
---|---|---|
committer | Thomas Haller <thaller@redhat.com> | 2015-06-25 18:49:18 +0200 |
commit | c2754ede5cc26a76e5804c09003c2175ef48cf6a (patch) | |
tree | ae4a93aa785b1c97fbb8706a363f8eb297a79e99 | |
parent | 4fa01c7dc92ffce449ef32620766712567151429 (diff) | |
download | NetworkManager-c2754ede5cc26a76e5804c09003c2175ef48cf6a.tar.gz |
platform: fix inverting guint8 value inet6_addr_gen_mode_inv
Fixes: e8e455817b340f60b396ba5d41425ed4de4c8554
-rw-r--r-- | src/platform/nm-linux-platform.c | 2 | ||||
-rw-r--r-- | src/platform/nm-platform.c | 6 | ||||
-rw-r--r-- | src/platform/nm-platform.h | 3 |
3 files changed, 6 insertions, 5 deletions
diff --git a/src/platform/nm-linux-platform.c b/src/platform/nm-linux-platform.c index 1392c207f8..eea117a979 100644 --- a/src/platform/nm-linux-platform.c +++ b/src/platform/nm-linux-platform.c @@ -1019,7 +1019,7 @@ _nmp_vt_cmd_plobj_init_from_nl_link (NMPlatform *platform, NMPlatformObject *_ob guint8 mode = 0; if (rtnl_link_inet6_get_addr_gen_mode (nlo, &mode) == 0) - obj->inet6_addr_gen_mode_inv = ~mode; + obj->inet6_addr_gen_mode_inv = _nm_platform_uint8_inv (mode); } #endif diff --git a/src/platform/nm-platform.c b/src/platform/nm-platform.c index 74ef161513..dddc7219f1 100644 --- a/src/platform/nm-platform.c +++ b/src/platform/nm-platform.c @@ -930,7 +930,7 @@ nm_platform_link_get_user_ipv6ll_enabled (NMPlatform *self, int ifindex) pllink = nm_platform_link_get (self, ifindex); if (pllink && pllink->inet6_addr_gen_mode_inv) - return (~pllink->inet6_addr_gen_mode_inv) == IN6_ADDR_GEN_MODE_NONE; + return _nm_platform_uint8_inv (pllink->inet6_addr_gen_mode_inv) == IN6_ADDR_GEN_MODE_NONE; } #endif return FALSE; @@ -2448,7 +2448,7 @@ nm_platform_link_to_string (const NMPlatformLink *link) str_vlan[0] = '\0'; if (link->inet6_addr_gen_mode_inv) { - switch ((guint8) ~link->inet6_addr_gen_mode_inv) { + switch (_nm_platform_uint8_inv (link->inet6_addr_gen_mode_inv)) { case 0: g_snprintf (str_addrmode, sizeof (str_addrmode), " addrgenmode eui64"); break; @@ -2456,7 +2456,7 @@ nm_platform_link_to_string (const NMPlatformLink *link) g_snprintf (str_addrmode, sizeof (str_addrmode), " addrgenmode none"); break; default: - g_snprintf (str_addrmode, sizeof (str_addrmode), " addrgenmode %d", (int) (guint8) (~link->inet6_addr_gen_mode_inv)); + g_snprintf (str_addrmode, sizeof (str_addrmode), " addrgenmode %d", _nm_platform_uint8_inv (link->inet6_addr_gen_mode_inv)); break; } } else diff --git a/src/platform/nm-platform.h b/src/platform/nm-platform.h index 4943133b26..4896783078 100644 --- a/src/platform/nm-platform.h +++ b/src/platform/nm-platform.h @@ -571,8 +571,9 @@ NMPlatform *nm_platform_try_get (void); * * Returns: the bitwise inverse of the route scope. * */ +#define nm_platform_route_scope_inv _nm_platform_uint8_inv static inline guint8 -nm_platform_route_scope_inv (guint8 scope) +_nm_platform_uint8_inv (guint8 scope) { return (guint8) ~scope; } |