[PATCH] clean up default value of IP_DCCP_ACKVEC

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

diff --git a/net/netfilter/xt_CONNMARK.c b/net/netfilter/xt_CONNMARK.c
index b269ba9f2934d75d11fe5f80361c9b616cc3d9f8..60c375d36f017c49b78fe41eb10509a7bdec1e7b 100644 (file)
--- a/net/netfilter/xt_CONNMARK.c
+++ b/net/netfilter/xt_CONNMARK.c
@@ -37,6 +37,7 @@ target(struct sk_buff **pskb,
        const struct net_device *in,
        const struct net_device *out,
        unsigned int hooknum,
+       const struct xt_target *target,
        const void *targinfo,
        void *userinfo)
 {
@@ -74,6 +75,7 @@ target(struct sk_buff **pskb,
 static int
 checkentry(const char *tablename,
           const void *entry,
+          const struct xt_target *target,
           void *targinfo,
           unsigned int targinfosize,
           unsigned int hook_mask)
@@ -100,6 +102,7 @@ static struct xt_target connmark_reg = {
        .target         = target,
        .targetsize     = sizeof(struct xt_connmark_target_info),
        .checkentry     = checkentry,
+       .family         = AF_INET,
        .me             = THIS_MODULE
 };
 
@@ -108,31 +111,32 @@ static struct xt_target connmark6_reg = {
        .target         = target,
        .targetsize     = sizeof(struct xt_connmark_target_info),
        .checkentry     = checkentry,
+       .family         = AF_INET6,
        .me             = THIS_MODULE
 };
 
-static int __init init(void)
+static int __init xt_connmark_init(void)
 {
        int ret;
 
        need_conntrack();
 
-       ret = xt_register_target(AF_INET, &connmark_reg);
+       ret = xt_register_target(&connmark_reg);
        if (ret)
                return ret;
 
-       ret = xt_register_target(AF_INET6, &connmark6_reg);
+       ret = xt_register_target(&connmark6_reg);
        if (ret)
-               xt_unregister_target(AF_INET, &connmark_reg);
+               xt_unregister_target(&connmark_reg);
 
        return ret;
 }
 
-static void __exit fini(void)
+static void __exit xt_connmark_fini(void)
 {
-       xt_unregister_target(AF_INET, &connmark_reg);
-       xt_unregister_target(AF_INET6, &connmark6_reg);
+       xt_unregister_target(&connmark_reg);
+       xt_unregister_target(&connmark6_reg);
 }
 
-module_init(init);
-module_exit(fini);
+module_init(xt_connmark_init);
+module_exit(xt_connmark_fini);