Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[linux-drm-fsl-dcu.git] / net / ipv4 / netfilter / arpt_mangle.c

diff --git a/net/ipv4/netfilter/arpt_mangle.c b/net/ipv4/netfilter/arpt_mangle.c
index c97650a16a5b61607b1c0f7463fb43deb2ba3b79..709db4d3f48f7fe9d7fb3f17a844595e9a690bde 100644 (file)
--- a/net/ipv4/netfilter/arpt_mangle.c
+++ b/net/ipv4/netfilter/arpt_mangle.c
@@ -8,9 +8,10 @@ MODULE_AUTHOR("Bart De Schuymer <bdschuym@pandora.be>");
 MODULE_DESCRIPTION("arptables arp payload mangle target");
 
 static unsigned int
-target(struct sk_buff **pskb, const struct net_device *in,
-   const struct net_device *out, unsigned int hooknum, const void *targinfo,
-   void *userinfo)
+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)
 {
        const struct arpt_mangle *mangle = targinfo;
        struct arphdr *arp;
@@ -65,8 +66,8 @@ target(struct sk_buff **pskb, const struct net_device *in,
 }
 
 static int
-checkentry(const char *tablename, const void *e, void *targinfo,
-   unsigned int targinfosize, unsigned int hook_mask)
+checkentry(const char *tablename, const void *e, const struct xt_target *target,
+          void *targinfo, unsigned int hook_mask)
 {
        const struct arpt_mangle *mangle = targinfo;
 
@@ -80,15 +81,15 @@ checkentry(const char *tablename, const void *e, void *targinfo,
        return 1;
 }
 
-static struct arpt_target arpt_mangle_reg
-= {
-        .name          = "mangle",
-        .target                = target,
-        .checkentry    = checkentry,
-        .me            = THIS_MODULE,
+static struct arpt_target arpt_mangle_reg = {
+       .name           = "mangle",
+       .target         = target,
+       .targetsize     = sizeof(struct arpt_mangle),
+       .checkentry     = checkentry,
+       .me             = THIS_MODULE,
 };
 
-static int __init init(void)
+static int __init arpt_mangle_init(void)
 {
        if (arpt_register_target(&arpt_mangle_reg))
                return -EINVAL;
@@ -96,10 +97,10 @@ static int __init init(void)
        return 0;
 }
 
-static void __exit fini(void)
+static void __exit arpt_mangle_fini(void)
 {
        arpt_unregister_target(&arpt_mangle_reg);
 }
 
-module_init(init);
-module_exit(fini);
+module_init(arpt_mangle_init);
+module_exit(arpt_mangle_fini);