Merge commit 'v2.6.29' into core/header-fixes

[linux-2.6-omap-h63xx.git] / include / linux / netfilter / xt_multiport.h

diff --git a/include/linux/netfilter/xt_multiport.h b/include/linux/netfilter/xt_multiport.h
index d49ee41837101ce431fdd8593ec4a09380e16743..185db499fcbc73ceddd6a4d96e61481d068f43b6 100644 (file)
--- a/include/linux/netfilter/xt_multiport.h
+++ b/include/linux/netfilter/xt_multiport.h
@@ -1,6 +1,8 @@
 #ifndef _XT_MULTIPORT_H
 #define _XT_MULTIPORT_H
 
+#include <linux/types.h>
+
 enum xt_multiport_flags
 {
        XT_MULTIPORT_SOURCE,
@@ -13,18 +15,18 @@ enum xt_multiport_flags
 /* Must fit inside union xt_matchinfo: 16 bytes */
 struct xt_multiport
 {
-       u_int8_t flags;                         /* Type of comparison */
-       u_int8_t count;                         /* Number of ports */
-       u_int16_t ports[XT_MULTI_PORTS];        /* Ports */
+       __u8 flags;                             /* Type of comparison */
+       __u8 count;                             /* Number of ports */
+       __u16 ports[XT_MULTI_PORTS];    /* Ports */
 };
 
 struct xt_multiport_v1
 {
-       u_int8_t flags;                         /* Type of comparison */
-       u_int8_t count;                         /* Number of ports */
-       u_int16_t ports[XT_MULTI_PORTS];        /* Ports */
-       u_int8_t pflags[XT_MULTI_PORTS];        /* Port flags */
-       u_int8_t invert;                        /* Invert flag */
+       __u8 flags;                             /* Type of comparison */
+       __u8 count;                             /* Number of ports */
+       __u16 ports[XT_MULTI_PORTS];    /* Ports */
+       __u8 pflags[XT_MULTI_PORTS];    /* Port flags */
+       __u8 invert;                    /* Invert flag */
 };
 
 #endif /*_XT_MULTIPORT_H*/