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_ipv6/ip6t_MARK.h | 4 ---- include/linux/netfilter_ipv6/ip6t_limit.h | 6 +----- include/linux/netfilter_ipv6/ip6t_mark.h | 8 ++------ 3 files changed, 3 insertions(+), 15 deletions(-) (limited to 'include/linux/netfilter_ipv6') 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