Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

[powerpc.git] / net / netfilter / xt_MARK.c

diff --git a/net/netfilter/xt_MARK.c b/net/netfilter/xt_MARK.c
index 0c11ee9..ee9c34e 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,53 +74,30 @@ 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)
 {
        struct xt_mark_target_info *markinfo = targinfo;
 
-       if (targinfosize != XT_ALIGN(sizeof(struct xt_mark_target_info))) {
-               printk(KERN_WARNING "MARK: targinfosize %u != %Zu\n",
-                      targinfosize,
-                      XT_ALIGN(sizeof(struct xt_mark_target_info)));
-               return 0;
-       }
-
-       if (strcmp(tablename, "mangle") != 0) {
-               printk(KERN_WARNING "MARK: can only be called from \"mangle\" table, not \"%s\"\n", tablename);
-               return 0;
-       }
-
        if (markinfo->mark > 0xffffffff) {
                printk(KERN_WARNING "MARK: Only supports 32bit wide mark\n");
                return 0;
        }
-
        return 1;
 }
 
 static int
 checkentry_v1(const char *tablename,
              const void *entry,
+             const struct xt_target *target,
              void *targinfo,
              unsigned int targinfosize,
              unsigned int hook_mask)
 {
        struct xt_mark_target_info_v1 *markinfo = targinfo;
 
-       if (targinfosize != XT_ALIGN(sizeof(struct xt_mark_target_info_v1))){
-               printk(KERN_WARNING "MARK: targinfosize %u != %Zu\n",
-                      targinfosize,
-                      XT_ALIGN(sizeof(struct xt_mark_target_info_v1)));
-               return 0;
-       }
-
-       if (strcmp(tablename, "mangle") != 0) {
-               printk(KERN_WARNING "MARK: can only be called from \"mangle\" table, not \"%s\"\n", tablename);
-               return 0;
-       }
-
        if (markinfo->mode != XT_MARK_SET
            && markinfo->mode != XT_MARK_AND
            && markinfo->mode != XT_MARK_OR) {
@@ -126,66 +105,73 @@ checkentry_v1(const char *tablename,
                       markinfo->mode);
                return 0;
        }
-
        if (markinfo->mark > 0xffffffff) {
                printk(KERN_WARNING "MARK: Only supports 32bit wide mark\n");
                return 0;
        }
-
        return 1;
 }
 
 static struct xt_target ipt_mark_reg_v0 = {
        .name           = "MARK",
        .target         = target_v0,
+       .targetsize     = sizeof(struct xt_mark_target_info),
+       .table          = "mangle",
        .checkentry     = checkentry_v0,
        .me             = THIS_MODULE,
+       .family         = AF_INET,
        .revision       = 0,
 };
 
 static struct xt_target ipt_mark_reg_v1 = {
        .name           = "MARK",
        .target         = target_v1,
+       .targetsize     = sizeof(struct xt_mark_target_info_v1),
+       .table          = "mangle",
        .checkentry     = checkentry_v1,
        .me             = THIS_MODULE,
+       .family         = AF_INET,
        .revision       = 1,
 };
 
 static struct xt_target ip6t_mark_reg_v0 = {
        .name           = "MARK",
        .target         = target_v0,
+       .targetsize     = sizeof(struct xt_mark_target_info),
+       .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);