Merge git://git.infradead.org/~dedekind/ubi-2.6

[linux-2.6-omap-h63xx.git] / include / linux / netfilter / xt_connlimit.h

diff --git a/include/linux/netfilter/xt_connlimit.h b/include/linux/netfilter/xt_connlimit.h
index 90ae8b474cb87cb9743069acf647b6fc81576662..7e3284bcbd2bd118470cbd5b9fc9ec955ad9ccea 100644 (file)
--- a/include/linux/netfilter/xt_connlimit.h
+++ b/include/linux/netfilter/xt_connlimit.h
@@ -5,12 +5,17 @@ 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;
+#ifndef __KERNEL__
+               union {
+                       __be32 v4_mask;
+                       __be32 v6_mask[4];
+               };
+#endif
        };
        unsigned int limit, inverse;
 
-       /* this needs to be at the end */
+       /* Used internally by the kernel */
        struct xt_connlimit_data *data __attribute__((aligned(8)));
 };