summaryrefslogtreecommitdiffstats
path: root/include/linux/netfilter_ipv6
diff options
context:
space:
mode:
authorYasuyuki KOZAKAI <yasuyuki@netfilter.org>2007-06-28 16:41:50 +0000
committerYasuyuki KOZAKAI <yasuyuki@netfilter.org>2007-06-28 16:41:50 +0000
commitfde395370ead306b770a3d4685e4bc1d6972266d (patch)
tree11550cade8711e45d3e4f774efd8fde0990b0fbb /include/linux/netfilter_ipv6
parent76258727e101a0960cc8fcf84d9a451e4b5fd9b5 (diff)
Removes some KERNEL_64_USERSPACE_32 because linux 2.6 has compat layer
Diffstat (limited to 'include/linux/netfilter_ipv6')
-rw-r--r--include/linux/netfilter_ipv6/ip6t_MARK.h4
-rw-r--r--include/linux/netfilter_ipv6/ip6t_limit.h6
-rw-r--r--include/linux/netfilter_ipv6/ip6t_mark.h8
3 files changed, 3 insertions, 15 deletions
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*/