Pull acpi_bus_register_driver into release branch

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

diff --git a/net/netfilter/xt_pkttype.c b/net/netfilter/xt_pkttype.c
index 872bb2a7d5b897f449384bec60f5c7adfe9df553..3ac703b5cb8ffb9413d8c5a7f12f616d576189e3 100644 (file)
--- a/net/netfilter/xt_pkttype.c
+++ b/net/netfilter/xt_pkttype.c
@@ -22,6 +22,7 @@ MODULE_ALIAS("ip6t_pkttype");
 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,
@@ -36,6 +37,7 @@ static struct xt_match pkttype_match = {
        .name           = "pkttype",
        .match          = match,
        .matchsize      = sizeof(struct xt_pkttype_info),
+       .family         = AF_INET,
        .me             = THIS_MODULE,
 };
 
@@ -43,28 +45,29 @@ static struct xt_match pkttype6_match = {
        .name           = "pkttype",
        .match          = match,
        .matchsize      = sizeof(struct xt_pkttype_info),
+       .family         = AF_INET6,
        .me             = THIS_MODULE,
 };
 
-static int __init init(void)
+static int __init xt_pkttype_init(void)
 {
        int ret;
-       ret = xt_register_match(AF_INET, &pkttype_match);
+       ret = xt_register_match(&pkttype_match);
        if (ret)
                return ret;
 
-       ret = xt_register_match(AF_INET6, &pkttype6_match);
+       ret = xt_register_match(&pkttype6_match);
        if (ret)
-               xt_unregister_match(AF_INET, &pkttype_match);
+               xt_unregister_match(&pkttype_match);
 
        return ret;
 }
 
-static void __exit fini(void)
+static void __exit xt_pkttype_fini(void)
 {
-       xt_unregister_match(AF_INET, &pkttype_match);
-       xt_unregister_match(AF_INET6, &pkttype6_match);
+       xt_unregister_match(&pkttype_match);
+       xt_unregister_match(&pkttype6_match);
 }
 
-module_init(init);
-module_exit(fini);
+module_init(xt_pkttype_init);
+module_exit(xt_pkttype_fini);