Merge branch 'header-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

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

diff --git a/include/linux/netfilter/xt_limit.h b/include/linux/netfilter/xt_limit.h
index fda222c7953ba95fd6c7b27e252870f1f5443487..bb47fc4d2adea1921124d5aa7e9702f179317596 100644 (file)
--- a/include/linux/netfilter/xt_limit.h
+++ b/include/linux/netfilter/xt_limit.h
@@ -1,6 +1,8 @@
 #ifndef _XT_RATE_H
 #define _XT_RATE_H
 
+#include <linux/types.h>
+
 /* timings are in milliseconds. */
 #define XT_LIMIT_SCALE 10000
 
@@ -9,13 +11,13 @@ struct xt_limit_priv;
 /* 1/10,000 sec period => max of 10,000/sec.  Min rate is then 429490
    seconds, or one every 59 hours. */
 struct xt_rateinfo {
-       u_int32_t avg;    /* Average secs between packets * scale */
-       u_int32_t burst;  /* Period multiplier for upper limit. */
+       __u32 avg;    /* Average secs between packets * scale */
+       __u32 burst;  /* Period multiplier for upper limit. */
 
        /* Used internally by the kernel */
        unsigned long prev; /* moved to xt_limit_priv */
-       u_int32_t credit; /* moved to xt_limit_priv */
-       u_int32_t credit_cap, cost;
+       __u32 credit; /* moved to xt_limit_priv */
+       __u32 credit_cap, cost;
 
        struct xt_limit_priv *master;
 };