From fde395370ead306b770a3d4685e4bc1d6972266d Mon Sep 17 00:00:00 2001 From: Yasuyuki KOZAKAI Date: Thu, 28 Jun 2007 16:41:50 +0000 Subject: Removes some KERNEL_64_USERSPACE_32 because linux 2.6 has compat layer --- include/linux/netfilter_ipv4/ipt_CONNMARK.h | 5 ----- include/linux/netfilter_ipv4/ipt_MARK.h | 8 -------- include/linux/netfilter_ipv4/ipt_ULOG.h | 5 ----- include/linux/netfilter_ipv4/ipt_connmark.h | 4 ---- include/linux/netfilter_ipv4/ipt_conntrack.h | 4 ---- include/linux/netfilter_ipv4/ipt_limit.h | 5 ----- include/linux/netfilter_ipv4/ipt_mark.h | 4 ---- include/linux/netfilter_ipv6/ip6t_MARK.h | 4 ---- include/linux/netfilter_ipv6/ip6t_limit.h | 6 +----- include/linux/netfilter_ipv6/ip6t_mark.h | 8 ++------ 10 files changed, 3 insertions(+), 50 deletions(-) (limited to 'include') diff --git a/include/linux/netfilter_ipv4/ipt_CONNMARK.h b/include/linux/netfilter_ipv4/ipt_CONNMARK.h index 0148539b..d3c02536 100644 --- a/include/linux/netfilter_ipv4/ipt_CONNMARK.h +++ b/include/linux/netfilter_ipv4/ipt_CONNMARK.h @@ -17,13 +17,8 @@ enum { }; struct ipt_connmark_target_info { -#ifdef KERNEL_64_USERSPACE_32 - unsigned long long mark; - unsigned long long mask; -#else unsigned long mark; unsigned long mask; -#endif u_int8_t mode; }; diff --git a/include/linux/netfilter_ipv4/ipt_MARK.h b/include/linux/netfilter_ipv4/ipt_MARK.h index 3694e488..1b6502fb 100644 --- a/include/linux/netfilter_ipv4/ipt_MARK.h +++ b/include/linux/netfilter_ipv4/ipt_MARK.h @@ -2,11 +2,7 @@ #define _IPT_MARK_H_target struct ipt_mark_target_info { -#ifdef KERNEL_64_USERSPACE_32 - unsigned long long mark; -#else unsigned long mark; -#endif }; enum { @@ -16,11 +12,7 @@ enum { }; struct ipt_mark_target_info_v1 { -#ifdef KERNEL_64_USERSPACE_32 - unsigned long long mark; -#else unsigned long mark; -#endif u_int8_t mode; }; diff --git a/include/linux/netfilter_ipv4/ipt_ULOG.h b/include/linux/netfilter_ipv4/ipt_ULOG.h index f267ab8e..417aad28 100644 --- a/include/linux/netfilter_ipv4/ipt_ULOG.h +++ b/include/linux/netfilter_ipv4/ipt_ULOG.h @@ -26,13 +26,8 @@ /* private data structure for each rule with a ULOG target */ struct ipt_ulog_info { unsigned int nl_group; -#ifdef KERNEL_64_USERSPACE_32 - unsigned long long copy_range; - unsigned long long qthreshold; -#else size_t copy_range; size_t qthreshold; -#endif char prefix[ULOG_PREFIX_LEN]; }; diff --git a/include/linux/netfilter_ipv4/ipt_connmark.h b/include/linux/netfilter_ipv4/ipt_connmark.h index 151e2687..46573270 100644 --- a/include/linux/netfilter_ipv4/ipt_connmark.h +++ b/include/linux/netfilter_ipv4/ipt_connmark.h @@ -11,11 +11,7 @@ */ struct ipt_connmark_info { -#ifdef KERNEL_64_USERSPACE_32 - unsigned long long mark, mask; -#else unsigned long mark, mask; -#endif u_int8_t invert; }; diff --git a/include/linux/netfilter_ipv4/ipt_conntrack.h b/include/linux/netfilter_ipv4/ipt_conntrack.h index c8661b88..54a99851 100644 --- a/include/linux/netfilter_ipv4/ipt_conntrack.h +++ b/include/linux/netfilter_ipv4/ipt_conntrack.h @@ -67,11 +67,7 @@ struct ipt_conntrack_info struct ip_conntrack_old_tuple tuple[IP_CT_DIR_MAX]; struct in_addr sipmsk[IP_CT_DIR_MAX], dipmsk[IP_CT_DIR_MAX]; -#ifdef KERNEL_64_USERSPACE_32 - unsigned long long expires_min, expires_max; -#else unsigned long expires_min, expires_max; -#endif /* Flags word */ u_int8_t flags; diff --git a/include/linux/netfilter_ipv4/ipt_limit.h b/include/linux/netfilter_ipv4/ipt_limit.h index e2fb1660..f46d4b4e 100644 --- a/include/linux/netfilter_ipv4/ipt_limit.h +++ b/include/linux/netfilter_ipv4/ipt_limit.h @@ -10,15 +10,10 @@ struct ipt_rateinfo { u_int32_t avg; /* Average secs between packets * scale */ u_int32_t burst; /* Period multiplier for upper limit. */ -#ifdef KERNEL_64_USERSPACE_32 - u_int64_t prev; - u_int64_t placeholder; -#else /* Used internally by the kernel */ unsigned long prev; /* Ugly, ugly fucker. */ struct ipt_rateinfo *master; -#endif u_int32_t credit; u_int32_t credit_cap, cost; diff --git a/include/linux/netfilter_ipv4/ipt_mark.h b/include/linux/netfilter_ipv4/ipt_mark.h index b9e79fd2..f3952b56 100644 --- a/include/linux/netfilter_ipv4/ipt_mark.h +++ b/include/linux/netfilter_ipv4/ipt_mark.h @@ -2,11 +2,7 @@ #define _IPT_MARK_H struct ipt_mark_info { -#ifdef KERNEL_64_USERSPACE_32 - unsigned long long mark, mask; -#else unsigned long mark, mask; -#endif u_int8_t invert; }; diff --git a/include/linux/netfilter_ipv6/ip6t_MARK.h b/include/linux/netfilter_ipv6/ip6t_MARK.h index 06949b82..7ade8d8f 100644 --- a/include/linux/netfilter_ipv6/ip6t_MARK.h +++ b/include/linux/netfilter_ipv6/ip6t_MARK.h @@ -2,11 +2,7 @@ #define _IP6T_MARK_H_target struct ip6t_mark_target_info { -#ifdef KERNEL_64_USERSPACE_32 - unsigned long long mark; -#else unsigned long mark; -#endif }; #endif /*_IPT_MARK_H_target*/ diff --git a/include/linux/netfilter_ipv6/ip6t_limit.h b/include/linux/netfilter_ipv6/ip6t_limit.h index cd3e8347..6e17a677 100644 --- a/include/linux/netfilter_ipv6/ip6t_limit.h +++ b/include/linux/netfilter_ipv6/ip6t_limit.h @@ -10,15 +10,11 @@ struct ip6t_rateinfo { u_int32_t avg; /* Average secs between packets * scale */ u_int32_t burst; /* Period multiplier for upper limit. */ -#ifdef KERNEL_64_USERSPACE_32 - u_int64_t prev; - u_int64_t placeholder; -#else /* Used internally by the kernel */ unsigned long prev; /* Ugly, ugly fucker. */ struct ip6t_rateinfo *master; -#endif + u_int32_t credit; u_int32_t credit_cap, cost; }; diff --git a/include/linux/netfilter_ipv6/ip6t_mark.h b/include/linux/netfilter_ipv6/ip6t_mark.h index 7ede185e..917c2435 100644 --- a/include/linux/netfilter_ipv6/ip6t_mark.h +++ b/include/linux/netfilter_ipv6/ip6t_mark.h @@ -2,12 +2,8 @@ #define _IP6T_MARK_H struct ip6t_mark_info { -#ifdef KERNEL_64_USERSPACE_32 - unsigned long long mark, mask; -#else - unsigned long mark, mask; -#endif - u_int8_t invert; + unsigned long mark, mask; + u_int8_t invert; }; #endif /*_IPT_MARK_H*/ -- cgit v1.2.3