[BRIDGE]: Remove duplicate const from is_link_local() argument type.

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

diff --git a/net/netfilter/xt_realm.c b/net/netfilter/xt_realm.c
index 2b7e1781d34da3fa56d6dd82c0eae5380ded8c56..57815a07db678f10deb558e5fc822cb9cde790d9 100644 (file)
--- a/net/netfilter/xt_realm.c
+++ b/net/netfilter/xt_realm.c
@@ -27,6 +27,7 @@ static int
 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,
@@ -38,30 +39,12 @@ match(const struct sk_buff *skb,
        return (info->id == (dst->tclassid & info->mask)) ^ info->invert;
 }
 
-static int check(const char *tablename,
-                 const void *ip,
-                 void *matchinfo,
-                 unsigned int matchsize,
-                 unsigned int hook_mask)
-{
-       if (hook_mask
-           & ~((1 << NF_IP_POST_ROUTING) | (1 << NF_IP_FORWARD) |
-               (1 << NF_IP_LOCAL_OUT) | (1 << NF_IP_LOCAL_IN))) {
-               printk("xt_realm: only valid for POST_ROUTING, LOCAL_OUT, "
-                      "LOCAL_IN or FORWARD.\n");
-               return 0;
-       }
-       if (matchsize != XT_ALIGN(sizeof(struct xt_realm_info))) {
-               printk("xt_realm: invalid matchsize.\n");
-               return 0;
-       }
-       return 1;
-}
-
 static struct xt_match realm_match = {
        .name           = "realm",
-       .match          = match, 
-       .checkentry     = check,
+       .match          = match,
+       .matchsize      = sizeof(struct xt_realm_info),
+       .hooks          = (1 << NF_IP_POST_ROUTING) | (1 << NF_IP_FORWARD) |
+                         (1 << NF_IP_LOCAL_OUT) | (1 << NF_IP_LOCAL_IN),
        .me             = THIS_MODULE
 };