diff options
| author | Jesper Brouer <jdb@comx.dk> | 2007-11-25 15:22:18 +0000 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2007-11-25 15:22:18 +0000 |
| commit | 2cfa903a2882a5d7819c697870af9ae3ab106386 (patch) | |
| tree | b23cdf8ab5702b99afe6617b03fcd1b2a2c6662c /include/linux/netfilter | |
| parent | 75b4b2081522ab2f680ca0edf2242bc6f28a0ef7 (diff) | |
Fix make/compile error for iptables-1.4.0rc1
Fixing a make/compile issue with iptables, release candidate 1.4.0rc1,
which has existed since SVN changeset 6920. This patch adds ip_tables.h
and ip6_tables.h, and updates x_tables.h, taken from Linus'es git tree.
Changeset 6920 added the include file x_tables.h from kernel source, but
didn't add ip_tables.h and ip6_tables.h.
At some point (Tue Nov 14 19:48:48 2006, by Yasuyuki Kozakai) these
kernel headers where changed, which actually removes certain
depencencies from ip_tables.h and ip6_tables.h to x_tables.h.
If compiling will fail, with old kernel headers (ip_tables.h and
ip6_tables.h) available in systems include path, because they depend on
certaine defines in x_tables.h with is missing in the version in SVN.
Jesper Brouer <jdb@comx.dk>
Diffstat (limited to 'include/linux/netfilter')
| -rw-r--r-- | include/linux/netfilter/x_tables.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/include/linux/netfilter/x_tables.h b/include/linux/netfilter/x_tables.h index 69ec8aea..95bc6957 100644 --- a/include/linux/netfilter/x_tables.h +++ b/include/linux/netfilter/x_tables.h @@ -1,8 +1,6 @@ #ifndef _X_TABLES_H #define _X_TABLES_H -#include <sys/types.h> - #define XT_FUNCTION_MAXNAMELEN 30 #define XT_TABLE_MAXNAMELEN 32 @@ -56,6 +54,14 @@ struct xt_entry_target unsigned char data[0]; }; +#define XT_TARGET_INIT(__name, __size) \ +{ \ + .target.u.user = { \ + .target_size = XT_ALIGN(__size), \ + .name = __name, \ + }, \ +} + struct xt_standard_target { struct xt_entry_target target; @@ -120,4 +126,5 @@ struct xt_counters_info #define XT_INV_PROTO 0x40 /* Invert the sense of PROTO. */ + #endif /* _X_TABLES_H */ |