From 7d5cc229064b0e718046b9ecaebad3426dfff15f Mon Sep 17 00:00:00 2001 From: Yasuyuki KOZAKAI Date: Sat, 30 Jun 2007 10:47:57 +0000 Subject: Removes KERNEL_64_USERSPACE_32 The recent kernel has compat layer for iptables. It doesn't have compat layer for libipq and ip6tables, but ip6tables with KERNEL_64_USERSPACE_32 is still broken. We should fix kernel instead of fixing them if and when we want use their 32bit binary with 64bit kernel. --- include/linux/netfilter_ipv4/ipt_CLUSTERIP.h | 4 ---- include/linux/netfilter_ipv4/ipt_SAME.h | 4 ---- 2 files changed, 8 deletions(-) (limited to 'include/linux/netfilter_ipv4') diff --git a/include/linux/netfilter_ipv4/ipt_CLUSTERIP.h b/include/linux/netfilter_ipv4/ipt_CLUSTERIP.h index 6f76060d..a8252ea5 100644 --- a/include/linux/netfilter_ipv4/ipt_CLUSTERIP.h +++ b/include/linux/netfilter_ipv4/ipt_CLUSTERIP.h @@ -27,11 +27,7 @@ struct ipt_clusterip_tgt_info { enum clusterip_hashmode hash_mode; u_int32_t hash_initval; -#ifdef KERNEL_64_USERSPACE_32 - u_int64_t config; -#else struct clusterip_config *config; -#endif }; #endif /*_IPT_CLUSTERIP_H_target*/ diff --git a/include/linux/netfilter_ipv4/ipt_SAME.h b/include/linux/netfilter_ipv4/ipt_SAME.h index 89ba22fa..cc4c0b22 100644 --- a/include/linux/netfilter_ipv4/ipt_SAME.h +++ b/include/linux/netfilter_ipv4/ipt_SAME.h @@ -10,11 +10,7 @@ struct ipt_same_info unsigned char info; u_int32_t rangesize; u_int32_t ipnum; -#ifdef KERNEL_64_USERSPACE_32 - u_int64_t placeholder; -#else u_int32_t *iparray; -#endif /* hangs off end. */ struct ip_nat_range range[IPT_SAME_MAX_RANGE]; -- cgit v1.2.3