From 0bec45374b784f53dd12a00e7363526303bcc77a Mon Sep 17 00:00:00 2001
From: Andreas Gruenbacher <agruen@linbit.com>
Date: Wed, 4 May 2011 16:06:51 +0200
Subject: [PATCH] --- yaml --- r: 346049 b: refs/heads/master c:
 a5d8e1fb9d22851de89bbf52db6b11c56b895dd4 h: refs/heads/master i:   346047:
 3eb87e133d3f53a7bb63aba8421ab4a3438377ae v: v3

---
 [refs]                                  |  2 +-
 trunk/include/linux/genl_magic_struct.h | 10 ++--------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index ff2749e46367..f32adebae5dd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 813472ced7fac734157fe5be1137ce2bac942902
+refs/heads/master: a5d8e1fb9d22851de89bbf52db6b11c56b895dd4
diff --git a/trunk/include/linux/genl_magic_struct.h b/trunk/include/linux/genl_magic_struct.h
index ddbdd0a24476..b1ddbb5bd725 100644
--- a/trunk/include/linux/genl_magic_struct.h
+++ b/trunk/include/linux/genl_magic_struct.h
@@ -86,8 +86,8 @@ enum {
 
 /* possible field types */
 #define __flg_field(attr_nr, attr_flag, name) \
-	__field(attr_nr, attr_flag, name, NLA_FLAG, char, \
-			nla_get_flag, __nla_put_flag)
+	__field(attr_nr, attr_flag, name, NLA_U8, char, \
+			nla_get_u8, NLA_PUT_U8)
 #define __u8_field(attr_nr, attr_flag, name)	\
 	__field(attr_nr, attr_flag, name, NLA_U8, unsigned char, \
 			nla_get_u8, NLA_PUT_U8)
@@ -118,12 +118,6 @@ enum {
 #define __str_field_def(attr_nr, attr_flag, name, maxlen) \
 	__str_field(attr_nr, attr_flag, name, maxlen)
 
-#define __nla_put_flag(skb, attrtype, value)		\
-	do {						\
-		if (value)				\
-			NLA_PUT_FLAG(skb, attrtype);	\
-	} while (0)
-
 #define GENL_op_init(args...)	args
 #define GENL_doit(handler)		\
 	.doit = handler,		\