summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2011-01-20 12:33:55 +0300
committerPatrick McHardy <kaber@trash.net>2011-01-20 12:33:55 +0300
commit82d800d8e7fa731b50deb851d16b68050673f587 (patch)
tree60acee6699b1cdb7fe5e2802947737dffeeeb6c9 /include
parent28a51ba59a1a983d63d4775e9bb8230fe0fb3b29 (diff)
parentcc4fc022571376412986e27e08b0765e9cb2aafb (diff)
downloadlinux-82d800d8e7fa731b50deb851d16b68050673f587.tar.xz
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')
-rw-r--r--include/linux/netfilter/xt_connlimit.h12
1 files changed, 12 insertions, 0 deletions
diff --git a/include/linux/netfilter/xt_connlimit.h b/include/linux/netfilter/xt_connlimit.h
index 7e3284bcbd2b..8884efc605c7 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)));