diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-26 16:11:41 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-26 16:11:41 -0700 |
commit | ba1eb95cf3cc666769afe42eaa15a3a34ae82f94 (patch) | |
tree | 011d8a65ad6e605741a66a833c3536394e8d0f3e /include/linux/netfilter/xt_statistic.h | |
parent | a8416961d32d8bb757bcbb86b72042b66d044510 (diff) | |
parent | 17d140402e6f0fd5dde2fdf8d045e3f95f865663 (diff) | |
download | kernel_samsung_espresso10-ba1eb95cf3cc666769afe42eaa15a3a34ae82f94.zip kernel_samsung_espresso10-ba1eb95cf3cc666769afe42eaa15a3a34ae82f94.tar.gz kernel_samsung_espresso10-ba1eb95cf3cc666769afe42eaa15a3a34ae82f94.tar.bz2 |
Merge branch 'header-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'header-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (50 commits)
x86: headers cleanup - setup.h
emu101k1.h: fix duplicate include of <linux/types.h>
compiler-gcc4: conditionalize #error on __KERNEL__
remove __KERNEL_STRICT_NAMES
make netfilter use strict integer types
make drm headers use strict integer types
make MTD headers use strict integer types
make most exported headers use strict integer types
make exported headers use strict posix types
unconditionally include asm/types.h from linux/types.h
make linux/types.h as assembly safe
Neither asm/types.h nor linux/types.h is required for arch/ia64/include/asm/fpu.h
headers_check fix cleanup: linux/reiserfs_fs.h
headers_check fix cleanup: linux/nubus.h
headers_check fix cleanup: linux/coda_psdev.h
headers_check fix: x86, setup.h
headers_check fix: x86, prctl.h
headers_check fix: linux/reinserfs_fs.h
headers_check fix: linux/socket.h
headers_check fix: linux/nubus.h
...
Manually fix trivial conflicts in:
include/linux/netfilter/xt_limit.h
include/linux/netfilter/xt_statistic.h
Diffstat (limited to 'include/linux/netfilter/xt_statistic.h')
-rw-r--r-- | include/linux/netfilter/xt_statistic.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/include/linux/netfilter/xt_statistic.h b/include/linux/netfilter/xt_statistic.h index 8f521ab..4e983ef 100644 --- a/include/linux/netfilter/xt_statistic.h +++ b/include/linux/netfilter/xt_statistic.h @@ -1,6 +1,8 @@ #ifndef _XT_STATISTIC_H #define _XT_STATISTIC_H +#include <linux/types.h> + enum xt_statistic_mode { XT_STATISTIC_MODE_RANDOM, XT_STATISTIC_MODE_NTH, @@ -16,16 +18,16 @@ enum xt_statistic_flags { struct xt_statistic_priv; struct xt_statistic_info { - u_int16_t mode; - u_int16_t flags; + __u16 mode; + __u16 flags; union { struct { - u_int32_t probability; + __u32 probability; } random; struct { - u_int32_t every; - u_int32_t packet; - u_int32_t count; /* unused */ + __u32 every; + __u32 packet; + __u32 count; /* unused */ } nth; } u; struct xt_statistic_priv *master __attribute__((aligned(8))); |