Pull bugzilla-7570 into release branch

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

diff --git a/net/netfilter/xt_DSCP.c b/net/netfilter/xt_DSCP.c
index 79df816..a7cc75a 100644 (file)
--- a/net/netfilter/xt_DSCP.c
+++ b/net/netfilter/xt_DSCP.c
@@ -32,8 +32,7 @@ static unsigned int target(struct sk_buff **pskb,
                           const struct net_device *out,
                           unsigned int hooknum,
                           const struct xt_target *target,
-                          const void *targinfo,
-                          void *userinfo)
+                          const void *targinfo)
 {
        const struct xt_DSCP_info *dinfo = targinfo;
        u_int8_t dscp = ipv4_get_dsfield((*pskb)->nh.iph) >> XT_DSCP_SHIFT;
@@ -54,8 +53,7 @@ static unsigned int target6(struct sk_buff **pskb,
                            const struct net_device *out,
                            unsigned int hooknum,
                            const struct xt_target *target,
-                           const void *targinfo,
-                           void *userinfo)
+                           const void *targinfo)
 {
        const struct xt_DSCP_info *dinfo = targinfo;
        u_int8_t dscp = ipv6_get_dsfield((*pskb)->nh.ipv6h) >> XT_DSCP_SHIFT;
@@ -74,7 +72,6 @@ static int checkentry(const char *tablename,
                      const void *e_void,
                      const struct xt_target *target,
                      void *targinfo,
-                     unsigned int targinfosize,
                      unsigned int hook_mask)
 {
        const u_int8_t dscp = ((struct xt_DSCP_info *)targinfo)->dscp;
@@ -86,44 +83,35 @@ static int checkentry(const char *tablename,
        return 1;
 }
 
-static struct xt_target xt_dscp_reg = {
-       .name           = "DSCP",
-       .target         = target,
-       .targetsize     = sizeof(struct xt_DSCP_info),
-       .table          = "mangle",
-       .checkentry     = checkentry,
-       .family         = AF_INET,
-       .me             = THIS_MODULE,
-};
-
-static struct xt_target xt_dscp6_reg = {
-       .name           = "DSCP",
-       .target         = target6,
-       .targetsize     = sizeof(struct xt_DSCP_info),
-       .table          = "mangle",
-       .checkentry     = checkentry,
-       .family         = AF_INET6,
-       .me             = THIS_MODULE,
+static struct xt_target xt_dscp_target[] = {
+       {
+               .name           = "DSCP",
+               .family         = AF_INET,
+               .checkentry     = checkentry,
+               .target         = target,
+               .targetsize     = sizeof(struct xt_DSCP_info),
+               .table          = "mangle",
+               .me             = THIS_MODULE,
+       },
+       {
+               .name           = "DSCP",
+               .family         = AF_INET6,
+               .checkentry     = checkentry,
+               .target         = target6,
+               .targetsize     = sizeof(struct xt_DSCP_info),
+               .table          = "mangle",
+               .me             = THIS_MODULE,
+       },
 };
 
 static int __init xt_dscp_target_init(void)
 {
-       int ret;
-       ret = xt_register_target(&xt_dscp_reg);
-       if (ret)
-               return ret;
-
-       ret = xt_register_target(&xt_dscp6_reg);
-       if (ret)
-               xt_unregister_target(&xt_dscp_reg);
-
-       return ret;
+       return xt_register_targets(xt_dscp_target, ARRAY_SIZE(xt_dscp_target));
 }
 
 static void __exit xt_dscp_target_fini(void)
 {
-       xt_unregister_target(&xt_dscp_reg);
-       xt_unregister_target(&xt_dscp6_reg);
+       xt_unregister_targets(xt_dscp_target, ARRAY_SIZE(xt_dscp_target));
 }
 
 module_init(xt_dscp_target_init);