diff options
| author | /C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=gandalf/emailAddress=gandalf@netfilter.org </C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=gandalf/emailAddress=gandalf@netfilter.org> | 2005-02-12 21:40:16 +0000 |
|---|---|---|
| committer | /C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=gandalf/emailAddress=gandalf@netfilter.org </C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=gandalf/emailAddress=gandalf@netfilter.org> | 2005-02-12 21:40:16 +0000 |
| commit | dd275bf4039376aaadb9d0b879f6e1c83b60655b (patch) | |
| tree | 0267bdbd52614ab1c4f58cbec5b026e1e2b07249 /include/linux/netfilter_ipv4/ipt_CONNMARK.h | |
| parent | 589fc9b71347432bfb02ca743c0a6adb31750b0b (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/linux/netfilter_ipv4/ipt_CONNMARK.h')
| -rw-r--r-- | include/linux/netfilter_ipv4/ipt_CONNMARK.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/netfilter_ipv4/ipt_CONNMARK.h b/include/linux/netfilter_ipv4/ipt_CONNMARK.h index d3c0253..0148539 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; }; |