Pull acpica into release branch

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

diff --git a/net/netfilter/xt_connbytes.c b/net/netfilter/xt_connbytes.c
index d9851358ff49eb6275b4192a8d05493e1d544ae2..1396fe2d07c14bc1b2f5ac0a0b15c444db597fd7 100644 (file)
--- a/net/netfilter/xt_connbytes.c
+++ b/net/netfilter/xt_connbytes.c
@@ -44,6 +44,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,
@@ -122,6 +123,7 @@ match(const struct sk_buff *skb,
 
 static int check(const char *tablename,
                 const void *ip,
+                const struct xt_match *match,
                 void *matchinfo,
                 unsigned int matchsize,
                 unsigned int hook_mask)
@@ -146,6 +148,7 @@ static struct xt_match connbytes_match = {
        .match          = match,
        .checkentry     = check,
        .matchsize      = sizeof(struct xt_connbytes_info),
+       .family         = AF_INET,
        .me             = THIS_MODULE
 };
 static struct xt_match connbytes6_match = {
@@ -153,27 +156,28 @@ static struct xt_match connbytes6_match = {
        .match          = match,
        .checkentry     = check,
        .matchsize      = sizeof(struct xt_connbytes_info),
+       .family         = AF_INET6,
        .me             = THIS_MODULE
 };
 
-static int __init init(void)
+static int __init xt_connbytes_init(void)
 {
        int ret;
-       ret = xt_register_match(AF_INET, &connbytes_match);
+       ret = xt_register_match(&connbytes_match);
        if (ret)
                return ret;
 
-       ret = xt_register_match(AF_INET6, &connbytes6_match);
+       ret = xt_register_match(&connbytes6_match);
        if (ret)
-               xt_unregister_match(AF_INET, &connbytes_match);
+               xt_unregister_match(&connbytes_match);
        return ret;
 }
 
-static void __exit fini(void)
+static void __exit xt_connbytes_fini(void)
 {
-       xt_unregister_match(AF_INET, &connbytes_match);
-       xt_unregister_match(AF_INET6, &connbytes6_match);
+       xt_unregister_match(&connbytes_match);
+       xt_unregister_match(&connbytes6_match);
 }
 
-module_init(init);
-module_exit(fini);
+module_init(xt_connbytes_init);
+module_exit(xt_connbytes_fini);