about summary refs log tree commit diff
path: root/src/platform
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2018-07-25 13:13:04 +0200
committerMichael Biebl <biebl@debian.org>2018-07-25 13:13:04 +0200
commit08984bbd9d6c7c8a033c7d1466c25a34bcc21c0d (patch)
tree53671bf0bb9d3f465b02a1bc149512a210da34a1 /src/platform
parent0d06e842e34adca9a743de93979a7432961257c6 (diff)
parentcaf1db9d6fbc056cc6c76a24574890f6c7895f3d (diff)
Update upstream source from tag 'upstream/1.12.2'
Update to upstream version '1.12.2'
with Debian dir 31e4999680481a4db05a3c008df492a8905a4ab3
Diffstat (limited to 'src/platform')
-rw-r--r--src/platform/nm-netlink.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/platform/nm-netlink.h b/src/platform/nm-netlink.h
index b938fa4a..185269ba 100644
--- a/src/platform/nm-netlink.h
+++ b/src/platform/nm-netlink.h
@@ -225,8 +225,8 @@ nla_put_string (struct nl_msg *msg, int attrtype, const char *str)
 
 #define NLA_PUT_TYPE(msg, type, attrtype, value) \
 	do { \
-		type __tmp = value; \
-		NLA_PUT(msg, attrtype, sizeof(type), &__tmp); \
+		type __nla_tmp = value; \
+		NLA_PUT(msg, attrtype, sizeof(type), &__nla_tmp); \
 	} while(0)
 
 #define NLA_PUT_U8(msg, attrtype, value) \