Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

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

diff --git a/net/netfilter/xt_physdev.c b/net/netfilter/xt_physdev.c
index f788e8e762540aad0409e55d1b632fd618005b6b..5fe4c9df17f5e7e015b524e3caa03a0acb3a1781 100644 (file)
--- a/net/netfilter/xt_physdev.c
+++ b/net/netfilter/xt_physdev.c
@@ -121,6 +121,7 @@ static struct xt_match physdev_match = {
        .match          = match,
        .matchsize      = sizeof(struct xt_physdev_info),
        .checkentry     = checkentry,
+       .family         = AF_INET,
        .me             = THIS_MODULE,
 };
 
@@ -129,29 +130,30 @@ static struct xt_match physdev6_match = {
        .match          = match,
        .matchsize      = sizeof(struct xt_physdev_info),
        .checkentry     = checkentry,
+       .family         = AF_INET6,
        .me             = THIS_MODULE,
 };
 
-static int __init init(void)
+static int __init xt_physdev_init(void)
 {
        int ret;
 
-       ret = xt_register_match(AF_INET, &physdev_match);
+       ret = xt_register_match(&physdev_match);
        if (ret < 0)
                return ret;
 
-       ret = xt_register_match(AF_INET6, &physdev6_match);
+       ret = xt_register_match(&physdev6_match);
        if (ret < 0)
-               xt_unregister_match(AF_INET, &physdev_match);
+               xt_unregister_match(&physdev_match);
 
        return ret;
 }
 
-static void __exit fini(void)
+static void __exit xt_physdev_fini(void)
 {
-       xt_unregister_match(AF_INET, &physdev_match);
-       xt_unregister_match(AF_INET6, &physdev6_match);
+       xt_unregister_match(&physdev_match);
+       xt_unregister_match(&physdev6_match);
 }
 
-module_init(init);
-module_exit(fini);
+module_init(xt_physdev_init);
+module_exit(xt_physdev_fini);