diff options
| author | /C=JP/ST=JP/CN=Yasuyuki Kozakai/emailAddress=yasuyuki@netfilter.org </C=JP/ST=JP/CN=Yasuyuki Kozakai/emailAddress=yasuyuki@netfilter.org> | 2007-06-30 10:47:57 +0000 |
|---|---|---|
| committer | /C=JP/ST=JP/CN=Yasuyuki Kozakai/emailAddress=yasuyuki@netfilter.org </C=JP/ST=JP/CN=Yasuyuki Kozakai/emailAddress=yasuyuki@netfilter.org> | 2007-06-30 10:47:57 +0000 |
| commit | a54381c95b2c5b56bd273336d05c565b433c6438 (patch) | |
| tree | bca510f92999b0ea708c4c316e248ccf86cfb036 /include/linux/netfilter_ipv4 | |
| parent | 3673435acd1e04617ca297a958167a8843328448 (diff) | |
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.
Diffstat (limited to 'include/linux/netfilter_ipv4')
| -rw-r--r-- | include/linux/netfilter_ipv4/ipt_CLUSTERIP.h | 4 | ||||
| -rw-r--r-- | include/linux/netfilter_ipv4/ipt_SAME.h | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/include/linux/netfilter_ipv4/ipt_CLUSTERIP.h b/include/linux/netfilter_ipv4/ipt_CLUSTERIP.h index 6f76060..a8252ea 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 89ba22f..cc4c0b2 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]; |