Merge branches 'release' and 'ppc-workaround' into release

[linux-2.6] / net / netfilter / xt_limit.c

diff --git a/net/netfilter/xt_limit.c b/net/netfilter/xt_limit.c
index c9352dbf3a1959b018be86f61e2fc6b49042782a..aad9ab8d2046d884ec596beb927cd481648cae93 100644 (file)
--- a/net/netfilter/xt_limit.c
+++ b/net/netfilter/xt_limit.c
@@ -16,7 +16,7 @@
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Herve Eychenne <rv@wallfire.org>");
-MODULE_DESCRIPTION("iptables rate limit match");
+MODULE_DESCRIPTION("Xtables: rate-limit match");
 MODULE_ALIAS("ipt_limit");
 MODULE_ALIAS("ip6t_limit");
 
@@ -187,6 +187,11 @@ static struct xt_match limit_mt_reg[] __read_mostly = {
                .checkentry     = limit_mt_check,
                .match          = limit_mt,
                .matchsize      = sizeof(struct xt_rateinfo),
+#ifdef CONFIG_COMPAT
+               .compatsize     = sizeof(struct compat_xt_rateinfo),
+               .compat_from_user = limit_mt_compat_from_user,
+               .compat_to_user = limit_mt_compat_to_user,
+#endif
                .me             = THIS_MODULE,
        },
 };