summaryrefslogtreecommitdiffstats
path: root/include/linux/netfilter/xt_connlimit.h
diff options
context:
space:
mode:
authorJan Engelhardt <jengelh@medozas.de>2009-02-21 04:42:32 +0100
committerJan Engelhardt <jengelh@medozas.de>2009-02-21 04:42:32 +0100
commit978e27e8f8c2e49d0528c6c4ae3a56627fbe8492 (patch)
treeb0de4c35b0d209b450cb86e022ce7552c3e778e8 /include/linux/netfilter/xt_connlimit.h
parentda68957303dea58632466d79d52f83bcbbca8925 (diff)
include: resynchronize headers with 2.6.29-rc5
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
Diffstat (limited to 'include/linux/netfilter/xt_connlimit.h')
-rw-r--r--include/linux/netfilter/xt_connlimit.h9
1 files changed, 6 insertions, 3 deletions
diff --git a/include/linux/netfilter/xt_connlimit.h b/include/linux/netfilter/xt_connlimit.h
index 90ae8b47..9ba54e48 100644
--- a/include/linux/netfilter/xt_connlimit.h
+++ b/include/linux/netfilter/xt_connlimit.h
@@ -5,12 +5,15 @@ struct xt_connlimit_data;
struct xt_connlimit_info {
union {
- u_int32_t v4_mask;
- u_int32_t v6_mask[4];
+ union nf_inet_addr mask;
+ union {
+ __be32 v4_mask;
+ __be32 v6_mask[4];
+ };
};
unsigned int limit, inverse;
- /* this needs to be at the end */
+ /* Used internally by the kernel */
struct xt_connlimit_data *data __attribute__((aligned(8)));
};