Merge branch 'for-3.2' of git://linux-nfs.org/~bfields/linux

[pandora-kernel.git] / include / linux / netfilter / xt_NFLOG.h

diff --git a/include/linux/netfilter/xt_NFLOG.h b/include/linux/netfilter/xt_NFLOG.h
index 4b36aeb..87b5831 100644 (file)
--- a/include/linux/netfilter/xt_NFLOG.h
+++ b/include/linux/netfilter/xt_NFLOG.h
@@ -1,17 +1,19 @@
 #ifndef _XT_NFLOG_TARGET
 #define _XT_NFLOG_TARGET
 
+#include <linux/types.h>
+
 #define XT_NFLOG_DEFAULT_GROUP         0x1
 #define XT_NFLOG_DEFAULT_THRESHOLD     0
 
 #define XT_NFLOG_MASK                  0x0
 
 struct xt_nflog_info {
-       u_int32_t       len;
-       u_int16_t       group;
-       u_int16_t       threshold;
-       u_int16_t       flags;
-       u_int16_t       pad;
+       __u32   len;
+       __u16   group;
+       __u16   threshold;
+       __u16   flags;
+       __u16   pad;
        char            prefix[64];
 };