Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband

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

diff --git a/net/netfilter/xt_MARK.c b/net/netfilter/xt_MARK.c
index 1bc968b519d8837771fc7b62805f6718e262f1e6..ee9c34edc76c4e8d8b920013c8f4825b6de37a36 100644 (file)
--- a/net/netfilter/xt_MARK.c
+++ b/net/netfilter/xt_MARK.c
@@ -26,6 +26,7 @@ target_v0(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)
 {
@@ -42,6 +43,7 @@ target_v1(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)
 {
@@ -72,6 +74,7 @@ target_v1(struct sk_buff **pskb,
 static int
 checkentry_v0(const char *tablename,
              const void *entry,
+             const struct xt_target *target,
              void *targinfo,
              unsigned int targinfosize,
              unsigned int hook_mask)
@@ -88,6 +91,7 @@ checkentry_v0(const char *tablename,
 static int
 checkentry_v1(const char *tablename,
              const void *entry,
+             const struct xt_target *target,
              void *targinfo,
              unsigned int targinfosize,
              unsigned int hook_mask)
@@ -115,6 +119,7 @@ static struct xt_target ipt_mark_reg_v0 = {
        .table          = "mangle",
        .checkentry     = checkentry_v0,
        .me             = THIS_MODULE,
+       .family         = AF_INET,
        .revision       = 0,
 };
 
@@ -125,6 +130,7 @@ static struct xt_target ipt_mark_reg_v1 = {
        .table          = "mangle",
        .checkentry     = checkentry_v1,
        .me             = THIS_MODULE,
+       .family         = AF_INET,
        .revision       = 1,
 };
 
@@ -135,36 +141,37 @@ static struct xt_target ip6t_mark_reg_v0 = {
        .table          = "mangle",
        .checkentry     = checkentry_v0,
        .me             = THIS_MODULE,
+       .family         = AF_INET6,
        .revision       = 0,
 };
 
-static int __init init(void)
+static int __init xt_mark_init(void)
 {
        int err;
 
-       err = xt_register_target(AF_INET, &ipt_mark_reg_v0);
+       err = xt_register_target(&ipt_mark_reg_v0);
        if (err)
                return err;
 
-       err = xt_register_target(AF_INET, &ipt_mark_reg_v1);
+       err = xt_register_target(&ipt_mark_reg_v1);
        if (err)
-               xt_unregister_target(AF_INET, &ipt_mark_reg_v0);
+               xt_unregister_target(&ipt_mark_reg_v0);
 
-       err = xt_register_target(AF_INET6, &ip6t_mark_reg_v0);
+       err = xt_register_target(&ip6t_mark_reg_v0);
        if (err) {
-               xt_unregister_target(AF_INET, &ipt_mark_reg_v0);
-               xt_unregister_target(AF_INET, &ipt_mark_reg_v1);
+               xt_unregister_target(&ipt_mark_reg_v0);
+               xt_unregister_target(&ipt_mark_reg_v1);
        }
 
        return err;
 }
 
-static void __exit fini(void)
+static void __exit xt_mark_fini(void)
 {
-       xt_unregister_target(AF_INET, &ipt_mark_reg_v0);
-       xt_unregister_target(AF_INET, &ipt_mark_reg_v1);
-       xt_unregister_target(AF_INET6, &ip6t_mark_reg_v0);
+       xt_unregister_target(&ipt_mark_reg_v0);
+       xt_unregister_target(&ipt_mark_reg_v1);
+       xt_unregister_target(&ip6t_mark_reg_v0);
 }
 
-module_init(init);
-module_exit(fini);
+module_init(xt_mark_init);
+module_exit(xt_mark_fini);