From 978e27e8f8c2e49d0528c6c4ae3a56627fbe8492 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 21 Feb 2009 04:42:32 +0100 Subject: include: resynchronize headers with 2.6.29-rc5 Signed-off-by: Jan Engelhardt --- include/linux/netfilter/xt_sctp.h | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'include/linux/netfilter/xt_sctp.h') diff --git a/include/linux/netfilter/xt_sctp.h b/include/linux/netfilter/xt_sctp.h index 62ffdcb0..d41af849 100644 --- a/include/linux/netfilter/xt_sctp.h +++ b/include/linux/netfilter/xt_sctp.h @@ -7,10 +7,6 @@ #define XT_SCTP_VALID_FLAGS 0x07 -/* temporary */ -#define SCTP_ARRAY_SIZE(x) (sizeof(x) / sizeof(*(x))) - - struct xt_sctp_flag_info { u_int8_t chunktype; u_int8_t flag; @@ -67,8 +63,8 @@ struct xt_sctp_info { memcpy((destmap), (srcmap), sizeof(srcmap)) #define SCTP_CHUNKMAP_IS_CLEAR(chunkmap) \ - __sctp_chunkmap_is_clear((chunkmap), SCTP_ARRAY_SIZE(chunkmap)) -static inline bool + __sctp_chunkmap_is_clear((chunkmap), ARRAY_SIZE(chunkmap)) +static __inline__ bool __sctp_chunkmap_is_clear(const u_int32_t *chunkmap, unsigned int n) { unsigned int i; @@ -80,7 +76,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 +static __inline__ bool __sctp_chunkmap_is_all_set(const u_int32_t *chunkmap, unsigned int n) { unsigned int i; -- cgit v1.2.3