Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

[linux-2.6-omap-h63xx.git] / net / netfilter / xt_statistic.c

diff --git a/net/netfilter/xt_statistic.c b/net/netfilter/xt_statistic.c
index 4089dae4e2865ae9f99377d307195ff69127f07b..0d75141139d5f7d96045f12c6e5d341fb44eb60e 100644 (file)
--- a/net/netfilter/xt_statistic.c
+++ b/net/netfilter/xt_statistic.c
@@ -18,19 +18,16 @@
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Patrick McHardy <kaber@trash.net>");
-MODULE_DESCRIPTION("xtables statistical match module");
+MODULE_DESCRIPTION("Xtables: statistics-based matching (\"Nth\", random)");
 MODULE_ALIAS("ipt_statistic");
 MODULE_ALIAS("ip6t_statistic");
 
 static DEFINE_SPINLOCK(nth_lock);
 
 static bool
-match(const struct sk_buff *skb,
-      const struct net_device *in, const struct net_device *out,
-      const struct xt_match *match, const void *matchinfo,
-      int offset, unsigned int protoff, bool *hotdrop)
+statistic_mt(const struct sk_buff *skb, const struct xt_match_param *par)
 {
-       struct xt_statistic_info *info = (struct xt_statistic_info *)matchinfo;
+       struct xt_statistic_info *info = (void *)par->matchinfo;
        bool ret = info->flags & XT_STATISTIC_INVERT;
 
        switch (info->mode) {
@@ -52,12 +49,9 @@ match(const struct sk_buff *skb,
        return ret;
 }
 
-static bool
-checkentry(const char *tablename, const void *entry,
-          const struct xt_match *match, void *matchinfo,
-          unsigned int hook_mask)
+static bool statistic_mt_check(const struct xt_mtchk_param *par)
 {
-       struct xt_statistic_info *info = matchinfo;
+       struct xt_statistic_info *info = par->matchinfo;
 
        if (info->mode > XT_STATISTIC_MODE_MAX ||
            info->flags & ~XT_STATISTIC_MASK)
@@ -66,36 +60,25 @@ checkentry(const char *tablename, const void *entry,
        return true;
 }
 
-static struct xt_match xt_statistic_match[] __read_mostly = {
-       {
-               .name           = "statistic",
-               .family         = AF_INET,
-               .checkentry     = checkentry,
-               .match          = match,
-               .matchsize      = sizeof(struct xt_statistic_info),
-               .me             = THIS_MODULE,
-       },
-       {
-               .name           = "statistic",
-               .family         = AF_INET6,
-               .checkentry     = checkentry,
-               .match          = match,
-               .matchsize      = sizeof(struct xt_statistic_info),
-               .me             = THIS_MODULE,
-       },
+static struct xt_match xt_statistic_mt_reg __read_mostly = {
+       .name       = "statistic",
+       .revision   = 0,
+       .family     = NFPROTO_UNSPEC,
+       .match      = statistic_mt,
+       .checkentry = statistic_mt_check,
+       .matchsize  = sizeof(struct xt_statistic_info),
+       .me         = THIS_MODULE,
 };
 
-static int __init xt_statistic_init(void)
+static int __init statistic_mt_init(void)
 {
-       return xt_register_matches(xt_statistic_match,
-                                  ARRAY_SIZE(xt_statistic_match));
+       return xt_register_match(&xt_statistic_mt_reg);
 }
 
-static void __exit xt_statistic_fini(void)
+static void __exit statistic_mt_exit(void)
 {
-       xt_unregister_matches(xt_statistic_match,
-                             ARRAY_SIZE(xt_statistic_match));
+       xt_unregister_match(&xt_statistic_mt_reg);
 }
 
-module_init(xt_statistic_init);
-module_exit(xt_statistic_fini);
+module_init(statistic_mt_init);
+module_exit(statistic_mt_exit);