diff options
author | Martin Josefsson <gandalf@wlug.westbo.se> | 2005-02-12 21:40:16 +0000 |
---|---|---|
committer | Martin Josefsson <gandalf@wlug.westbo.se> | 2005-02-12 21:40:16 +0000 |
commit | 02964b869a8616b41e4c2dc899ff23921aaaa4b0 (patch) | |
tree | 0267bdbd52614ab1c4f58cbec5b026e1e2b07249 /include | |
parent | c10f2510bc9869bca391f45a6c9a4a59042322a5 (diff) |
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 <pablo@eurodev.net>
Signed-off-by: Martin Josefsson <gandalf@wlug.westbo.se>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/netfilter_ipv4/ipt_CONNMARK.h | 5 | ||||
-rw-r--r-- | include/linux/netfilter_ipv4/ipt_connmark.h | 4 |
2 files changed, 9 insertions, 0 deletions
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; }; |