[S390] add __cpuinit to appldata cpu hotplug notifier.

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

diff --git a/net/netfilter/xt_connbytes.c b/net/netfilter/xt_connbytes.c
index f34ecb9485c7f820047b8ac9d5207a0a2676cc30..1396fe2d07c14bc1b2f5ac0a0b15c444db597fd7 100644 (file)
--- a/net/netfilter/xt_connbytes.c
+++ b/net/netfilter/xt_connbytes.c
@@ -148,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 = {
@@ -155,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);