netfilter: xtables: make XT_ALIGN() usable in exported headers by exporting __ALIGN_K...

[safe/jmp/linux-2.6] / include / linux / netfilter / xt_sctp.h

diff --git a/include/linux/netfilter/xt_sctp.h b/include/linux/netfilter/xt_sctp.h
index 32000ba..29287be 100644 (file)
--- a/include/linux/netfilter/xt_sctp.h
+++ b/include/linux/netfilter/xt_sctp.h
@@ -1,6 +1,8 @@
 #ifndef _XT_SCTP_H_
 #define _XT_SCTP_H_
 
+#include <linux/types.h>
+
 #define XT_SCTP_SRC_PORTS              0x01
 #define XT_SCTP_DEST_PORTS             0x02
 #define XT_SCTP_CHUNK_TYPES            0x04
@@ -8,49 +10,49 @@
 #define XT_SCTP_VALID_FLAGS            0x07
 
 struct xt_sctp_flag_info {
-       u_int8_t chunktype;
-       u_int8_t flag;
-       u_int8_t flag_mask;
+       __u8 chunktype;
+       __u8 flag;
+       __u8 flag_mask;
 };
 
 #define XT_NUM_SCTP_FLAGS      4
 
 struct xt_sctp_info {
-       u_int16_t dpts[2];  /* Min, Max */
-       u_int16_t spts[2];  /* Min, Max */
+       __u16 dpts[2];  /* Min, Max */
+       __u16 spts[2];  /* Min, Max */
 
-       u_int32_t chunkmap[256 / sizeof (u_int32_t)];  /* Bit mask of chunks to be matched according to RFC 2960 */
+       __u32 chunkmap[256 / sizeof (__u32)];  /* Bit mask of chunks to be matched according to RFC 2960 */
 
 #define SCTP_CHUNK_MATCH_ANY   0x01  /* Match if any of the chunk types are present */
 #define SCTP_CHUNK_MATCH_ALL   0x02  /* Match if all of the chunk types are present */
 #define SCTP_CHUNK_MATCH_ONLY  0x04  /* Match if these are the only chunk types present */
 
-       u_int32_t chunk_match_type;
+       __u32 chunk_match_type;
        struct xt_sctp_flag_info flag_info[XT_NUM_SCTP_FLAGS];
        int flag_count;
 
-       u_int32_t flags;
-       u_int32_t invflags;
+       __u32 flags;
+       __u32 invflags;
 };
 
 #define bytes(type) (sizeof(type) * 8)
 
 #define SCTP_CHUNKMAP_SET(chunkmap, type)              \
        do {                                            \
-               (chunkmap)[type / bytes(u_int32_t)] |=  \
-                       1 << (type % bytes(u_int32_t)); \
+               (chunkmap)[type / bytes(__u32)] |=      \
+                       1 << (type % bytes(__u32));     \
        } while (0)
 
 #define SCTP_CHUNKMAP_CLEAR(chunkmap, type)                    \
        do {                                                    \
-               (chunkmap)[type / bytes(u_int32_t)] &=          \
-                       ~(1 << (type % bytes(u_int32_t)));      \
+               (chunkmap)[type / bytes(__u32)] &=              \
+                       ~(1 << (type % bytes(__u32)));  \
        } while (0)
 
 #define SCTP_CHUNKMAP_IS_SET(chunkmap, type)                   \
 ({                                                             \
-       ((chunkmap)[type / bytes (u_int32_t)] &                 \
-               (1 << (type % bytes (u_int32_t)))) ? 1: 0;      \
+       ((chunkmap)[type / bytes (__u32)] &             \
+               (1 << (type % bytes (__u32)))) ? 1: 0;  \
 })
 
 #define SCTP_CHUNKMAP_RESET(chunkmap) \
@@ -65,7 +67,7 @@ struct xt_sctp_info {
 #define SCTP_CHUNKMAP_IS_CLEAR(chunkmap) \
        __sctp_chunkmap_is_clear((chunkmap), ARRAY_SIZE(chunkmap))
 static inline bool
-__sctp_chunkmap_is_clear(const u_int32_t *chunkmap, unsigned int n)
+__sctp_chunkmap_is_clear(const __u32 *chunkmap, unsigned int n)
 {
        unsigned int i;
        for (i = 0; i < n; ++i)
@@ -77,7 +79,7 @@ __sctp_chunkmap_is_clear(const u_int32_t *chunkmap, unsigned int n)
 #define SCTP_CHUNKMAP_IS_ALL_SET(chunkmap) \
        __sctp_chunkmap_is_all_set((chunkmap), ARRAY_SIZE(chunkmap))
 static inline bool
-__sctp_chunkmap_is_all_set(const u_int32_t *chunkmap, unsigned int n)
+__sctp_chunkmap_is_all_set(const __u32 *chunkmap, unsigned int n)
 {
        unsigned int i;
        for (i = 0; i < n; ++i)