[PATCH] Update contact info for Geert Uytterhoeven

[powerpc.git] / net / netfilter / xt_tcpmss.c

diff --git a/net/netfilter/xt_tcpmss.c b/net/netfilter/xt_tcpmss.c
index acf7f53..cf7d335 100644 (file)
--- a/net/netfilter/xt_tcpmss.c
+++ b/net/netfilter/xt_tcpmss.c
@@ -81,6 +81,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,
@@ -92,81 +93,44 @@ match(const struct sk_buff *skb,
                               info->invert, hotdrop);
 }
 
-static int
-checkentry(const char *tablename,
-           const void *ipinfo,
-           void *matchinfo,
-           unsigned int matchsize,
-           unsigned int hook_mask)
-{
-       const struct ipt_ip *ip = ipinfo;
-       if (matchsize != XT_ALIGN(sizeof(struct xt_tcpmss_match_info)))
-               return 0;
-
-       /* Must specify -p tcp */
-       if (ip->proto != IPPROTO_TCP || (ip->invflags & IPT_INV_PROTO)) {
-               printk("tcpmss: Only works on TCP packets\n");
-               return 0;
-       }
-
-       return 1;
-}
-
-static int
-checkentry6(const char *tablename,
-          const void *ipinfo,
-           void *matchinfo,
-           unsigned int matchsize,
-           unsigned int hook_mask)
-{
-       const struct ip6t_ip6 *ip = ipinfo;
-
-       if (matchsize != XT_ALIGN(sizeof(struct xt_tcpmss_match_info)))
-               return 0;
-
-       /* Must specify -p tcp */
-       if (ip->proto != IPPROTO_TCP || (ip->invflags & XT_INV_PROTO)) {
-               printk("tcpmss: Only works on TCP packets\n");
-               return 0;
-       }
-
-       return 1;
-}
-
 static struct xt_match tcpmss_match = {
        .name           = "tcpmss",
-       .match          = &match,
-       .checkentry     = &checkentry,
+       .match          = match,
+       .matchsize      = sizeof(struct xt_tcpmss_match_info),
+       .proto          = IPPROTO_TCP,
+       .family         = AF_INET,
        .me             = THIS_MODULE,
 };
 
 static struct xt_match tcpmss6_match = {
        .name           = "tcpmss",
-       .match          = &match,
-       .checkentry     = &checkentry6,
+       .match          = match,
+       .matchsize      = sizeof(struct xt_tcpmss_match_info),
+       .proto          = IPPROTO_TCP,
+       .family         = AF_INET6,
        .me             = THIS_MODULE,
 };
 
 
-static int __init init(void)
+static int __init xt_tcpmss_init(void)
 {
        int ret;
-       ret = xt_register_match(AF_INET, &tcpmss_match);
+       ret = xt_register_match(&tcpmss_match);
        if (ret)
                return ret;
 
-       ret = xt_register_match(AF_INET6, &tcpmss6_match);
+       ret = xt_register_match(&tcpmss6_match);
        if (ret)
-               xt_unregister_match(AF_INET, &tcpmss_match);
+               xt_unregister_match(&tcpmss_match);
 
        return ret;
 }
 
-static void __exit fini(void)
+static void __exit xt_tcpmss_fini(void)
 {
-       xt_unregister_match(AF_INET6, &tcpmss6_match);
-       xt_unregister_match(AF_INET, &tcpmss_match);
+       xt_unregister_match(&tcpmss6_match);
+       xt_unregister_match(&tcpmss_match);
 }
 
-module_init(init);
-module_exit(fini);
+module_init(xt_tcpmss_init);
+module_exit(xt_tcpmss_fini);