diff options
author | Patrick McHardy <kaber@trash.net> | 2011-01-20 10:33:55 +0100 |
---|---|---|
committer | Patrick McHardy <kaber@trash.net> | 2011-01-20 10:33:55 +0100 |
commit | 82d800d8e7fa731b50deb851d16b68050673f587 (patch) | |
tree | 60acee6699b1cdb7fe5e2802947737dffeeeb6c9 /include/linux/netfilter | |
parent | 28a51ba59a1a983d63d4775e9bb8230fe0fb3b29 (diff) | |
parent | cc4fc022571376412986e27e08b0765e9cb2aafb (diff) | |
download | op-kernel-dev-82d800d8e7fa731b50deb851d16b68050673f587.zip op-kernel-dev-82d800d8e7fa731b50deb851d16b68050673f587.tar.gz |
Merge branch 'connlimit' of git://dev.medozas.de/linux
Conflicts:
Documentation/feature-removal-schedule.txt
Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'include/linux/netfilter')
-rw-r--r-- | include/linux/netfilter/xt_connlimit.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/include/linux/netfilter/xt_connlimit.h b/include/linux/netfilter/xt_connlimit.h index 7e3284b..8884efc 100644 --- a/include/linux/netfilter/xt_connlimit.h +++ b/include/linux/netfilter/xt_connlimit.h @@ -3,6 +3,11 @@ struct xt_connlimit_data; +enum { + XT_CONNLIMIT_INVERT = 1 << 0, + XT_CONNLIMIT_DADDR = 1 << 1, +}; + struct xt_connlimit_info { union { union nf_inet_addr mask; @@ -14,6 +19,13 @@ struct xt_connlimit_info { #endif }; unsigned int limit, inverse; + union { + /* revision 0 */ + unsigned int inverse; + + /* revision 1 */ + __u32 flags; + }; /* Used internally by the kernel */ struct xt_connlimit_data *data __attribute__((aligned(8))); |