diff options
| author | Thomas Haller <thaller@redhat.com> | 2016-02-29 17:06:21 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2016-02-29 20:41:01 +0100 |
| commit | a22cb566eae6a8a128bf4a77305c872dd7816870 (patch) | |
| tree | ae6c3fbcbbbb0462c49b38d65d1a3cc1638375b4 /src/platform/nm-linux-platform.c | |
| parent | 9dc9309b0562cd14e2d15689e03464a68543bae2 (diff) | |
| download | NetworkManager-th/platform-ipv4-flags.tar.gz | |
platform: add flags argument to nm_platform_ip4_address_add()th/platform-ipv4-flags
The argument is still always unset. We will need it later to set
IFA_F_NOPREFIXROUTE.
Diffstat (limited to 'src/platform/nm-linux-platform.c')
| -rw-r--r-- | src/platform/nm-linux-platform.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/platform/nm-linux-platform.c b/src/platform/nm-linux-platform.c index 2757bb0682..7ed9262c09 100644 --- a/src/platform/nm-linux-platform.c +++ b/src/platform/nm-linux-platform.c @@ -2224,7 +2224,7 @@ _nl_msg_new_address (int nlmsg_type, NLA_PUT (msg, IFA_CACHEINFO, sizeof(ca), &ca); } - if (flags & ~0xFF) { + if (flags & ~((guint32) 0xFF)) { /* only set the IFA_FLAGS attribute, if they actually contain additional * flags that are not already set to am.ifa_flags. * @@ -5182,6 +5182,7 @@ ip4_address_add (NMPlatform *platform, in_addr_t peer_addr, guint32 lifetime, guint32 preferred, + guint32 flags, const char *label) { NMPObject obj_id; @@ -5194,7 +5195,7 @@ ip4_address_add (NMPlatform *platform, &addr, plen, &peer_addr, - 0, + flags, nmp_utils_ip4_address_is_link_local (addr) ? RT_SCOPE_LINK : RT_SCOPE_UNIVERSE, lifetime, preferred, |