diff options
author | Jan Engelhardt <jengelh@medozas.de> | 2010-01-31 22:42:52 +0100 |
---|---|---|
committer | Jan Engelhardt <jengelh@medozas.de> | 2010-02-01 01:17:29 +0100 |
commit | 350661a6eb089f3e54e67e022db9e16ea280499f (patch) | |
tree | e6857b58f535bab42e2381f7fbb027f4cc9aa63a /include/linux/netfilter/xt_connmark.h | |
parent | 028ad9ec6d5c27c107c9a7a316617cbe366abb0f (diff) |
includes: header updates
Update the shipped Linux kernel headers from 2.6.33-rc6, as
iptables's ipt_ECN.h for example references ipt_DSCP.h, which no
longer exists.
Since a number of old code pieces have been removed in the kernel in
that fashion, the structs for older versions are moved into the .c
file, to keep header updating simple.
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
Diffstat (limited to 'include/linux/netfilter/xt_connmark.h')
-rw-r--r-- | include/linux/netfilter/xt_connmark.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/include/linux/netfilter/xt_connmark.h b/include/linux/netfilter/xt_connmark.h index 359ef869..619e47cd 100644 --- a/include/linux/netfilter/xt_connmark.h +++ b/include/linux/netfilter/xt_connmark.h @@ -1,6 +1,8 @@ #ifndef _XT_CONNMARK_H #define _XT_CONNMARK_H +#include <linux/types.h> + /* Copyright (C) 2002,2004 MARA Systems AB <http://www.marasystems.com> * by Henrik Nordstrom <hno@marasystems.com> * @@ -10,14 +12,9 @@ * (at your option) any later version. */ -struct xt_connmark_info { - unsigned long mark, mask; - u_int8_t invert; -}; - struct xt_connmark_mtinfo1 { - u_int32_t mark, mask; - u_int8_t invert; + __u32 mark, mask; + __u8 invert; }; #endif /*_XT_CONNMARK_H*/ |