diff options
author | Martin Josefsson <gandalf@wlug.westbo.se> | 2004-05-26 21:56:26 +0000 |
---|---|---|
committer | Martin Josefsson <gandalf@wlug.westbo.se> | 2004-05-26 21:56:26 +0000 |
commit | c5617bf84475028dd1663cde076b93f355ce42a7 (patch) | |
tree | 198938989ba4ca43c19bc02c100af0aca8d06e15 /include/linux | |
parent | a28d495285ad7dd9f286d63958cf20d74eec6bcb (diff) |
With a 64bit kernel only the high 32bits of nfmark was used regardless of
32/64bit userspace. This makes it quite hard to interoperate with 'tc'.
Sync ipv6 versions with ipv4 versions.
Tested on x86 and sparc64 with both 32bit and 64bit userspace.
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/netfilter_ipv4/ipt_MARK.h | 12 | ||||
-rw-r--r-- | include/linux/netfilter_ipv4/ipt_mark.h | 13 | ||||
-rw-r--r-- | include/linux/netfilter_ipv6/ip6t_MARK.h | 12 | ||||
-rw-r--r-- | include/linux/netfilter_ipv6/ip6t_mark.h | 13 |
4 files changed, 50 insertions, 0 deletions
diff --git a/include/linux/netfilter_ipv4/ipt_MARK.h b/include/linux/netfilter_ipv4/ipt_MARK.h new file mode 100644 index 00000000..6febfe64 --- /dev/null +++ b/include/linux/netfilter_ipv4/ipt_MARK.h @@ -0,0 +1,12 @@ +#ifndef _IPT_MARK_H_target +#define _IPT_MARK_H_target + +struct ipt_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_ipv4/ipt_mark.h b/include/linux/netfilter_ipv4/ipt_mark.h new file mode 100644 index 00000000..b9e79fd2 --- /dev/null +++ b/include/linux/netfilter_ipv4/ipt_mark.h @@ -0,0 +1,13 @@ +#ifndef _IPT_MARK_H +#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; +}; + +#endif /*_IPT_MARK_H*/ diff --git a/include/linux/netfilter_ipv6/ip6t_MARK.h b/include/linux/netfilter_ipv6/ip6t_MARK.h new file mode 100644 index 00000000..06949b82 --- /dev/null +++ b/include/linux/netfilter_ipv6/ip6t_MARK.h @@ -0,0 +1,12 @@ +#ifndef _IP6T_MARK_H_target +#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_mark.h b/include/linux/netfilter_ipv6/ip6t_mark.h new file mode 100644 index 00000000..7ede185e --- /dev/null +++ b/include/linux/netfilter_ipv6/ip6t_mark.h @@ -0,0 +1,13 @@ +#ifndef _IP6T_MARK_H +#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; +}; + +#endif /*_IPT_MARK_H*/ |