netlink: create helpers for checking type is an int

There's a number of policies which check if type is a uint or sint.
Factor the checking against the list of value sizes to a helper
for easier reuse.

v2: - new patch

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/netlink.h b/include/net/netlink.h
index 5a5ff97..c5aa46f 100644 (file)
--- a/include/net/netlink.h
+++ b/include/net/netlink.h
@@ -362,20 +362,21 @@ struct nla_policy {
 #define NLA_POLICY_BITFIELD32(valid) \
        { .type = NLA_BITFIELD32, .bitfield32_valid = valid }
 
+#define __NLA_IS_UINT_TYPE(tp)                                         \
+       (tp == NLA_U8 || tp == NLA_U16 || tp == NLA_U32 || tp == NLA_U64)
+#define __NLA_IS_SINT_TYPE(tp)                                         \
+       (tp == NLA_S8 || tp == NLA_S16 || tp == NLA_S32 || tp == NLA_S64)
+
 #define __NLA_ENSURE(condition) BUILD_BUG_ON_ZERO(!(condition))
 #define NLA_ENSURE_UINT_OR_BINARY_TYPE(tp)             \
-       (__NLA_ENSURE(tp == NLA_U8 || tp == NLA_U16 ||  \
-                     tp == NLA_U32 || tp == NLA_U64 || \
+       (__NLA_ENSURE(__NLA_IS_UINT_TYPE(tp) || \
                      tp == NLA_MSECS ||                \
                      tp == NLA_BINARY) + tp)
 #define NLA_ENSURE_SINT_TYPE(tp)                       \
-       (__NLA_ENSURE(tp == NLA_S8 || tp == NLA_S16  || \
-                     tp == NLA_S32 || tp == NLA_S64) + tp)
+       (__NLA_ENSURE(__NLA_IS_SINT_TYPE(tp)) + tp)
 #define NLA_ENSURE_INT_OR_BINARY_TYPE(tp)              \
-       (__NLA_ENSURE(tp == NLA_S8 || tp == NLA_U8 ||   \
-                     tp == NLA_S16 || tp == NLA_U16 || \
-                     tp == NLA_S32 || tp == NLA_U32 || \
-                     tp == NLA_S64 || tp == NLA_U64 || \
+       (__NLA_ENSURE(__NLA_IS_UINT_TYPE(tp) ||         \
+                     __NLA_IS_SINT_TYPE(tp) ||         \
                      tp == NLA_MSECS ||                \
                      tp == NLA_BINARY) + tp)
 #define NLA_ENSURE_NO_VALIDATION_PTR(tp)               \