From 02964b869a8616b41e4c2dc899ff23921aaaa4b0 Mon Sep 17 00:00:00 2001 From: Martin Josefsson Date: Sat, 12 Feb 2005 21:40:16 +0000 Subject: Fix CONNMARK/connmark issues with 64bit kernel and 32bit userspace. Also fixes a typo in CONNMARK, --mask set the mark, not the mask. Initial patch by: Pablo Neira Signed-off-by: Martin Josefsson --- include/linux/netfilter_ipv4/ipt_CONNMARK.h | 5 +++++ include/linux/netfilter_ipv4/ipt_connmark.h | 4 ++++ 2 files changed, 9 insertions(+) (limited to 'include/linux') diff --git a/include/linux/netfilter_ipv4/ipt_CONNMARK.h b/include/linux/netfilter_ipv4/ipt_CONNMARK.h index d3c02536..0148539b 100644 --- a/include/linux/netfilter_ipv4/ipt_CONNMARK.h +++ b/include/linux/netfilter_ipv4/ipt_CONNMARK.h @@ -17,8 +17,13 @@ enum { }; struct ipt_connmark_target_info { +#ifdef KERNEL_64_USERSPACE_32 + unsigned long long mark; + unsigned long long mask; +#else unsigned long mark; unsigned long mask; +#endif u_int8_t mode; }; diff --git a/include/linux/netfilter_ipv4/ipt_connmark.h b/include/linux/netfilter_ipv4/ipt_connmark.h index 46573270..151e2687 100644 --- a/include/linux/netfilter_ipv4/ipt_connmark.h +++ b/include/linux/netfilter_ipv4/ipt_connmark.h @@ -11,7 +11,11 @@ */ struct ipt_connmark_info { +#ifdef KERNEL_64_USERSPACE_32 + unsigned long long mark, mask; +#else unsigned long mark, mask; +#endif u_int8_t invert; }; -- cgit v1.2.3