Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

[karo-tx-linux.git] / net / netfilter / xt_dccp.c

diff --git a/net/netfilter/xt_dccp.c b/net/netfilter/xt_dccp.c
index 06e9ef2b1d4c99fee19134d93916cb1a9490ee10..dfb10b648e570c0fce716bdae0644349f66357b9 100644 (file)
--- a/net/netfilter/xt_dccp.c
+++ b/net/netfilter/xt_dccp.c
@@ -95,6 +95,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,
@@ -129,6 +130,7 @@ match(const struct sk_buff *skb,
 static int
 checkentry(const char *tablename,
           const void *inf,
+          const struct xt_match *match,
           void *matchinfo,
           unsigned int matchsize,
           unsigned int hook_mask)
@@ -147,6 +149,7 @@ static struct xt_match dccp_match =
        .matchsize      = sizeof(struct xt_dccp_info),
        .proto          = IPPROTO_DCCP,
        .checkentry     = checkentry,
+       .family         = AF_INET,
        .me             = THIS_MODULE,
 };
 static struct xt_match dccp6_match = 
@@ -156,11 +159,12 @@ static struct xt_match dccp6_match =
        .matchsize      = sizeof(struct xt_dccp_info),
        .proto          = IPPROTO_DCCP,
        .checkentry     = checkentry,
+       .family         = AF_INET6,
        .me             = THIS_MODULE,
 };
 
 
-static int __init init(void)
+static int __init xt_dccp_init(void)
 {
        int ret;
 
@@ -170,29 +174,29 @@ static int __init init(void)
        dccp_optbuf = kmalloc(256 * 4, GFP_KERNEL);
        if (!dccp_optbuf)
                return -ENOMEM;
-       ret = xt_register_match(AF_INET, &dccp_match);
+       ret = xt_register_match(&dccp_match);
        if (ret)
                goto out_kfree;
-       ret = xt_register_match(AF_INET6, &dccp6_match);
+       ret = xt_register_match(&dccp6_match);
        if (ret)
                goto out_unreg;
 
        return ret;
 
 out_unreg:
-       xt_unregister_match(AF_INET, &dccp_match);
+       xt_unregister_match(&dccp_match);
 out_kfree:
        kfree(dccp_optbuf);
 
        return ret;
 }
 
-static void __exit fini(void)
+static void __exit xt_dccp_fini(void)
 {
-       xt_unregister_match(AF_INET6, &dccp6_match);
-       xt_unregister_match(AF_INET, &dccp_match);
+       xt_unregister_match(&dccp6_match);
+       xt_unregister_match(&dccp_match);
        kfree(dccp_optbuf);
 }
 
-module_init(init);
-module_exit(fini);
+module_init(xt_dccp_init);
+module_exit(xt_dccp_fini);