Merge branch 'connlimit' of git://dev.medozas.de/linux

diff --git a/include/linux/netfilter/xt_connlimit.h b/include/linux/netfilter/xt_connlimit.h
index 8884efc605c7b91771e037a24242119e0ce74420..ab1d3b57fff7937fb5e9926dff8609e4799d4c12 100644 (file)
--- a/include/linux/netfilter/xt_connlimit.h
+++ b/include/linux/netfilter/xt_connlimit.h
@@ -18,7 +18,7 @@ struct xt_connlimit_info {
                };
 #endif
        };
-       unsigned int limit, inverse;
+       unsigned int limit;
        union {
                /* revision 0 */
                unsigned int inverse;