]> err.no Git - linux-2.6/commitdiff
[NETFILTER]: x_tables: remove unused argument to target functions
authorPatrick McHardy <kaber@trash.net>
Tue, 22 Aug 2006 07:35:47 +0000 (00:35 -0700)
committerDavid S. Miller <davem@sunset.davemloft.net>
Fri, 22 Sep 2006 21:55:33 +0000 (14:55 -0700)
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
41 files changed:
include/linux/netfilter/x_tables.h
include/linux/netfilter_arp/arp_tables.h
include/linux/netfilter_ipv4/ip_tables.h
include/linux/netfilter_ipv6/ip6_tables.h
net/ipv4/netfilter/arp_tables.c
net/ipv4/netfilter/arpt_mangle.c
net/ipv4/netfilter/arptable_filter.c
net/ipv4/netfilter/ip_nat_rule.c
net/ipv4/netfilter/ip_tables.c
net/ipv4/netfilter/ipt_CLUSTERIP.c
net/ipv4/netfilter/ipt_ECN.c
net/ipv4/netfilter/ipt_LOG.c
net/ipv4/netfilter/ipt_MASQUERADE.c
net/ipv4/netfilter/ipt_NETMAP.c
net/ipv4/netfilter/ipt_REDIRECT.c
net/ipv4/netfilter/ipt_REJECT.c
net/ipv4/netfilter/ipt_SAME.c
net/ipv4/netfilter/ipt_TCPMSS.c
net/ipv4/netfilter/ipt_TOS.c
net/ipv4/netfilter/ipt_TTL.c
net/ipv4/netfilter/ipt_ULOG.c
net/ipv4/netfilter/iptable_filter.c
net/ipv4/netfilter/iptable_mangle.c
net/ipv4/netfilter/iptable_raw.c
net/ipv6/netfilter/ip6_tables.c
net/ipv6/netfilter/ip6t_HL.c
net/ipv6/netfilter/ip6t_LOG.c
net/ipv6/netfilter/ip6t_REJECT.c
net/ipv6/netfilter/ip6table_filter.c
net/ipv6/netfilter/ip6table_mangle.c
net/ipv6/netfilter/ip6table_raw.c
net/netfilter/xt_CLASSIFY.c
net/netfilter/xt_CONNMARK.c
net/netfilter/xt_CONNSECMARK.c
net/netfilter/xt_DSCP.c
net/netfilter/xt_MARK.c
net/netfilter/xt_NFQUEUE.c
net/netfilter/xt_NOTRACK.c
net/netfilter/xt_SECMARK.c
net/netfilter/xt_connbytes.c
net/sched/act_ipt.c

index 9a9912430e3ae76394f216a23e4ebf7cd0b03c7e..9cef0e91542b870e0b0a2e455573c37946b2fe60 100644 (file)
@@ -211,8 +211,7 @@ struct xt_target
                               const struct net_device *out,
                               unsigned int hooknum,
                               const struct xt_target *target,
-                              const void *targinfo,
-                              void *userdata);
+                              const void *targinfo);
 
        /* Called when user tries to insert an entry of this type:
            hook_mask is a bitmask of hooks from which it can be
index 62cc27daca4efe2a4fb1b2ac1a384c06229e2ff4..149e87c9ab1367cd95e5f058a40427f2167303f5 100644 (file)
@@ -248,8 +248,7 @@ extern unsigned int arpt_do_table(struct sk_buff **pskb,
                                  unsigned int hook,
                                  const struct net_device *in,
                                  const struct net_device *out,
-                                 struct arpt_table *table,
-                                 void *userdata);
+                                 struct arpt_table *table);
 
 #define ARPT_ALIGN(s) (((s) + (__alignof__(struct arpt_entry)-1)) & ~(__alignof__(struct arpt_entry)-1))
 #endif /*__KERNEL__*/
index c0dac16e1902d97809398ac858fe36768feb9547..a536bbdef14554ba9732e3a7b67c14e8ae6c2825 100644 (file)
@@ -312,8 +312,7 @@ extern unsigned int ipt_do_table(struct sk_buff **pskb,
                                 unsigned int hook,
                                 const struct net_device *in,
                                 const struct net_device *out,
-                                struct ipt_table *table,
-                                void *userdata);
+                                struct ipt_table *table);
 
 #define IPT_ALIGN(s) XT_ALIGN(s)
 
index d0d5d1ee4be31c64e9b64df889c68d68d73db46a..d7a8e9c0dad06ec657e324e6136b34921397b36e 100644 (file)
@@ -300,8 +300,7 @@ extern unsigned int ip6t_do_table(struct sk_buff **pskb,
                                  unsigned int hook,
                                  const struct net_device *in,
                                  const struct net_device *out,
-                                 struct ip6t_table *table,
-                                 void *userdata);
+                                 struct ip6t_table *table);
 
 /* Check for an extension */
 extern int ip6t_ext_hdr(u8 nexthdr);
index 8d1d7a6e72a563149c253d52c292f259b7e87884..c6bd270bf46a274f5e3e4b94267e4d53c6366775 100644 (file)
@@ -208,8 +208,7 @@ static unsigned int arpt_error(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)
 {
        if (net_ratelimit())
                printk("arp_tables: error: '%s'\n", (char *)targinfo);
@@ -226,8 +225,7 @@ unsigned int arpt_do_table(struct sk_buff **pskb,
                           unsigned int hook,
                           const struct net_device *in,
                           const struct net_device *out,
-                          struct arpt_table *table,
-                          void *userdata)
+                          struct arpt_table *table)
 {
        static const char nulldevname[IFNAMSIZ];
        unsigned int verdict = NF_DROP;
@@ -302,8 +300,7 @@ unsigned int arpt_do_table(struct sk_buff **pskb,
                                                                     in, out,
                                                                     hook,
                                                                     t->u.kernel.target,
-                                                                    t->data,
-                                                                    userdata);
+                                                                    t->data);
 
                                /* Target might have changed stuff. */
                                arp = (*pskb)->nh.arph;
index a58325c1ceb94a8b75b2c0669c25bc8258f3830b..05fb2421bb26a474f5b3faffe5d0098ed74f5944 100644 (file)
@@ -11,7 +11,7 @@ static unsigned int
 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)
+       const void *targinfo)
 {
        const struct arpt_mangle *mangle = targinfo;
        struct arphdr *arp;
index d7c472faa53b9666449b66dda6629137b1ae1970..7edea2a1696c010930cd77d89c76cc558f217063 100644 (file)
@@ -155,7 +155,7 @@ static unsigned int arpt_hook(unsigned int hook,
                              const struct net_device *out,
                              int (*okfn)(struct sk_buff *))
 {
-       return arpt_do_table(pskb, hook, in, out, &packet_filter, NULL);
+       return arpt_do_table(pskb, hook, in, out, &packet_filter);
 }
 
 static struct nf_hook_ops arpt_ops[] = {
index 1aba926c1cb05444d57dd9cc695fb9d999f5e824..1aa0e4f462a51755eb4c4a120601bb0def0682d1 100644 (file)
@@ -104,8 +104,7 @@ static unsigned int ipt_snat_target(struct sk_buff **pskb,
                                    const struct net_device *out,
                                    unsigned int hooknum,
                                    const struct ipt_target *target,
-                                   const void *targinfo,
-                                   void *userinfo)
+                                   const void *targinfo)
 {
        struct ip_conntrack *ct;
        enum ip_conntrack_info ctinfo;
@@ -147,8 +146,7 @@ static unsigned int ipt_dnat_target(struct sk_buff **pskb,
                                    const struct net_device *out,
                                    unsigned int hooknum,
                                    const struct ipt_target *target,
-                                   const void *targinfo,
-                                   void *userinfo)
+                                   const void *targinfo)
 {
        struct ip_conntrack *ct;
        enum ip_conntrack_info ctinfo;
@@ -255,7 +253,7 @@ int ip_nat_rule_find(struct sk_buff **pskb,
 {
        int ret;
 
-       ret = ipt_do_table(pskb, hooknum, in, out, &nat_table, NULL);
+       ret = ipt_do_table(pskb, hooknum, in, out, &nat_table);
 
        if (ret == NF_ACCEPT) {
                if (!ip_nat_initialized(ct, HOOK2MANIP(hooknum)))
index 048514f15f2ffe116dcbebc0aa1672eae54045f4..8ce5b6f76447f88bc97913d72c6b53f0812610a8 100644 (file)
@@ -180,8 +180,7 @@ ipt_error(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)
 {
        if (net_ratelimit())
                printk("ip_tables: error: `%s'\n", (char *)targinfo);
@@ -217,8 +216,7 @@ ipt_do_table(struct sk_buff **pskb,
             unsigned int hook,
             const struct net_device *in,
             const struct net_device *out,
-            struct ipt_table *table,
-            void *userdata)
+            struct ipt_table *table)
 {
        static const char nulldevname[IFNAMSIZ] __attribute__((aligned(sizeof(long))));
        u_int16_t offset;
@@ -308,8 +306,7 @@ ipt_do_table(struct sk_buff **pskb,
                                                                     in, out,
                                                                     hook,
                                                                     t->u.kernel.target,
-                                                                    t->data,
-                                                                    userdata);
+                                                                    t->data);
 
 #ifdef CONFIG_NETFILTER_DEBUG
                                if (((struct ipt_entry *)table_base)->comefrom
index d994c5f5744ceb5373712e040954a8eac3233a61..a08383cf9e7a3722f26083b0deda050d85e72a6a 100644 (file)
@@ -302,8 +302,7 @@ 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 ipt_clusterip_tgt_info *cipinfo = targinfo;
        enum ip_conntrack_info ctinfo;
index 7e30e6d2b5da3339b17617c812ea781fa0c2ff38..1c3da4a48e5fabd4a86a36ea7e85260baed19d69 100644 (file)
@@ -85,8 +85,7 @@ 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 ipt_ECN_info *einfo = targinfo;
 
index b98f7b08b084586478ec431ec83485aa6118ff8c..a8d356c6191ff273080483472759083db9ed47ac 100644 (file)
@@ -416,8 +416,7 @@ ipt_log_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 ipt_log_info *loginfo = targinfo;
        struct nf_loginfo li;
index ebd94f2abf0d49674d8ba6d74e34dff475eb7588..9659793c66c0a765828fceb7bb695f7a83c7cb20 100644 (file)
@@ -64,8 +64,7 @@ masquerade_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)
 {
        struct ip_conntrack *ct;
        enum ip_conntrack_info ctinfo;
index 736c4b5a86a79f5158f114eec47c902af22c0cff..fd5e74a19fb55847b41b4b5ba29e9e583ac01dd2 100644 (file)
@@ -55,8 +55,7 @@ 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)
 {
        struct ip_conntrack *ct;
        enum ip_conntrack_info ctinfo;
index f290463232de407527a639d48253bbda8724c0dc..839fe99f71d42b714d915386396041fb90d614a1 100644 (file)
@@ -58,8 +58,7 @@ redirect_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)
 {
        struct ip_conntrack *ct;
        enum ip_conntrack_info ctinfo;
index 95c6662b663c5df25fdedef7320714072e49d6fa..1dfd8e56be8b78b4d315cddc54f79d14c8d0a3c9 100644 (file)
@@ -228,8 +228,7 @@ static unsigned int reject(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 ipt_reject_info *reject = targinfo;
 
index 7169b09b5a6752f8dae9f46510aebbb08f7c8b0e..cf801749490f739ea5299e6ab4f896125488fa55 100644 (file)
@@ -133,8 +133,7 @@ same_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)
 {
        struct ip_conntrack *ct;
        enum ip_conntrack_info ctinfo;
index 0fce85e055071a9e47c3cd23d1be0c4c27289fff..6d668dcfc22a15dfd6fdcc102fdee607b6cc2b89 100644 (file)
@@ -41,8 +41,7 @@ ipt_tcpmss_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 ipt_tcpmss_info *tcpmssinfo = targinfo;
        struct tcphdr *tcph;
index 52e9d705d48ec891dd9feb846fa8e1e55de129ac..043df0137084f7b8a3d64ffdb073826a933ba2f7 100644 (file)
@@ -26,8 +26,7 @@ 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 ipt_tos_target_info *tosinfo = targinfo;
        struct iphdr *iph = (*pskb)->nh.iph;
index 2afb2a8aa8c5c31ee2ae4541bf2b825de5760e1c..164007107b5e0577ef5b52e6644af3bb485ad7f9 100644 (file)
@@ -23,7 +23,7 @@ static unsigned int
 ipt_ttl_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)
+              const void *targinfo)
 {
        struct iphdr *iph;
        const struct ipt_TTL_info *info = targinfo;
index d46fd677fa11f8f48f30e136d843cb95f3ae8c45..4c5f0a117862cdbf240af92836973d87c44983c6 100644 (file)
@@ -308,7 +308,7 @@ static unsigned int ipt_ulog_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)
 {
        struct ipt_ulog_info *loginfo = (struct ipt_ulog_info *) targinfo;
 
index 7f417484bfbf3ee566359bd13d02199c1034b696..e2e7dd8d7903eb60090e5fb6a9b5d3b8a06769e9 100644 (file)
@@ -90,7 +90,7 @@ ipt_hook(unsigned int hook,
         const struct net_device *out,
         int (*okfn)(struct sk_buff *))
 {
-       return ipt_do_table(pskb, hook, in, out, &packet_filter, NULL);
+       return ipt_do_table(pskb, hook, in, out, &packet_filter);
 }
 
 static unsigned int
@@ -108,7 +108,7 @@ ipt_local_out_hook(unsigned int hook,
                return NF_ACCEPT;
        }
 
-       return ipt_do_table(pskb, hook, in, out, &packet_filter, NULL);
+       return ipt_do_table(pskb, hook, in, out, &packet_filter);
 }
 
 static struct nf_hook_ops ipt_ops[] = {
index 4e7998beda635970bacb483dae78052180d649c8..79336cb42527387d9708fcdb9c4bd4105ea66767 100644 (file)
@@ -119,7 +119,7 @@ ipt_route_hook(unsigned int hook,
         const struct net_device *out,
         int (*okfn)(struct sk_buff *))
 {
-       return ipt_do_table(pskb, hook, in, out, &packet_mangler, NULL);
+       return ipt_do_table(pskb, hook, in, out, &packet_mangler);
 }
 
 static unsigned int
@@ -148,7 +148,7 @@ ipt_local_hook(unsigned int hook,
        daddr = (*pskb)->nh.iph->daddr;
        tos = (*pskb)->nh.iph->tos;
 
-       ret = ipt_do_table(pskb, hook, in, out, &packet_mangler, NULL);
+       ret = ipt_do_table(pskb, hook, in, out, &packet_mangler);
        /* Reroute for ANY change. */
        if (ret != NF_DROP && ret != NF_STOLEN && ret != NF_QUEUE
            && ((*pskb)->nh.iph->saddr != saddr
index 7912cce1e1b8d2a0b1af3689354b8f590cd43fcd..bcbeb4aeacd912ec50f6153f5f8905935638a803 100644 (file)
@@ -95,7 +95,7 @@ ipt_hook(unsigned int hook,
         const struct net_device *out,
         int (*okfn)(struct sk_buff *))
 {
-       return ipt_do_table(pskb, hook, in, out, &packet_raw, NULL);
+       return ipt_do_table(pskb, hook, in, out, &packet_raw);
 }
 
 /* 'raw' is the very first table. */
index c9d6b23cd3f7141ff91b8cf11c3fff6e622a9e9c..38cd7ffda9a08406be0f6cd0914ea7ea161decdc 100644 (file)
@@ -220,8 +220,7 @@ ip6t_error(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)
 {
        if (net_ratelimit())
                printk("ip6_tables: error: `%s'\n", (char *)targinfo);
@@ -258,8 +257,7 @@ ip6t_do_table(struct sk_buff **pskb,
              unsigned int hook,
              const struct net_device *in,
              const struct net_device *out,
-             struct xt_table *table,
-             void *userdata)
+             struct xt_table *table)
 {
        static const char nulldevname[IFNAMSIZ] __attribute__((aligned(sizeof(long))));
        int offset = 0;
@@ -349,8 +347,7 @@ ip6t_do_table(struct sk_buff **pskb,
                                                                     in, out,
                                                                     hook,
                                                                     t->u.kernel.target,
-                                                                    t->data,
-                                                                    userdata);
+                                                                    t->data);
 
 #ifdef CONFIG_NETFILTER_DEBUG
                                if (((struct ip6t_entry *)table_base)->comefrom
index b8eff8ee69b1fb71ed044f47bae88f564c78d61a..c85d124f9a3d0ffb7c3b7442fc29b6958baa0944 100644 (file)
@@ -22,7 +22,7 @@ static unsigned int ip6t_hl_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)
 {
        struct ipv6hdr *ip6h;
        const struct ip6t_HL_info *info = targinfo;
index 73c6300109d61d7243e89f5268d3d9fbe3ec3e30..acb91733e1fdc646f6ebe099c33f6de37c289e74 100644 (file)
@@ -427,8 +427,7 @@ ip6t_log_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 ip6t_log_info *loginfo = targinfo;
        struct nf_loginfo li;
index 7929ff4021660c2d330717dd77b566d6663a7122..343acd3cbf5e18d80091510e56afd8100123a80e 100644 (file)
@@ -180,8 +180,7 @@ static unsigned int reject6_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 ip6t_reject_info *reject = targinfo;
 
index 60976c0c58e81ecdf3320152415d5be0bc80812f..2fc07c74decf6ca468a4c643eb513d5543a3e693 100644 (file)
@@ -108,7 +108,7 @@ ip6t_hook(unsigned int hook,
         const struct net_device *out,
         int (*okfn)(struct sk_buff *))
 {
-       return ip6t_do_table(pskb, hook, in, out, &packet_filter, NULL);
+       return ip6t_do_table(pskb, hook, in, out, &packet_filter);
 }
 
 static unsigned int
@@ -128,7 +128,7 @@ ip6t_local_out_hook(unsigned int hook,
        }
 #endif
 
-       return ip6t_do_table(pskb, hook, in, out, &packet_filter, NULL);
+       return ip6t_do_table(pskb, hook, in, out, &packet_filter);
 }
 
 static struct nf_hook_ops ip6t_ops[] = {
index 03a13eab1daef67a7766b328acb9886edbd64014..32db04fd831012ab8561ededc38bdd489840fb04 100644 (file)
@@ -138,7 +138,7 @@ ip6t_route_hook(unsigned int hook,
         const struct net_device *out,
         int (*okfn)(struct sk_buff *))
 {
-       return ip6t_do_table(pskb, hook, in, out, &packet_mangler, NULL);
+       return ip6t_do_table(pskb, hook, in, out, &packet_mangler);
 }
 
 static unsigned int
@@ -174,7 +174,7 @@ ip6t_local_hook(unsigned int hook,
        /* flowlabel and prio (includes version, which shouldn't change either */
        flowlabel = *((u_int32_t *) (*pskb)->nh.ipv6h);
 
-       ret = ip6t_do_table(pskb, hook, in, out, &packet_mangler, NULL);
+       ret = ip6t_do_table(pskb, hook, in, out, &packet_mangler);
 
        if (ret != NF_DROP && ret != NF_STOLEN 
                && (memcmp(&(*pskb)->nh.ipv6h->saddr, &saddr, sizeof(saddr))
index 61a7c58e99f88c72fe3dda967388820460da47e1..b4154da575c0693d78924a6912fe91cea69b128c 100644 (file)
@@ -122,7 +122,7 @@ ip6t_hook(unsigned int hook,
         const struct net_device *out,
         int (*okfn)(struct sk_buff *))
 {
-       return ip6t_do_table(pskb, hook, in, out, &packet_raw, NULL);
+       return ip6t_do_table(pskb, hook, in, out, &packet_raw);
 }
 
 static struct nf_hook_ops ip6t_ops[] = { 
index 1f92edd059336a9bf042d9c1059c4ef62fcde8d6..50de965bb1043093d06ab11dcfefab81dc5f5df2 100644 (file)
@@ -29,8 +29,7 @@ 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_classify_target_info *clinfo = targinfo;
 
index e577356b5c7117ad84fa7c0d0d08d544eadeec6f..c2125f6ee1284502bfd6b9923b21c341cbd82c50 100644 (file)
@@ -38,8 +38,7 @@ 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_connmark_target_info *markinfo = targinfo;
        u_int32_t diff;
index 48f7fc3c85cdd4df40052ab53b6b3709963eba0a..4b9cc65bb82b2208cbc1cddbc4f04fe577437ae1 100644 (file)
@@ -66,7 +66,7 @@ static void secmark_restore(struct sk_buff *skb)
 static unsigned int 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)
+                          const void *targinfo)
 {
        struct sk_buff *skb = *pskb;
        const struct xt_connsecmark_target_info *info = targinfo;
index a1cd9723644fa370e0101b416db425c2abb06af8..9d23c9580d802743e59685c4cd66bb4e9b8f1530 100644 (file)
@@ -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;
index 0a61272194677767828114d107f829a439adfc58..95a171c8799410be5560d494b8a65823d47714e3 100644 (file)
@@ -27,8 +27,7 @@ target_v0(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_mark_target_info *markinfo = targinfo;
 
@@ -44,8 +43,7 @@ target_v1(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_mark_target_info_v1 *markinfo = targinfo;
        int mark = 0;
index 7b982283abdbe297fdb66d7e1ff0189caa8f3317..db9b896e57c8527ecfc9db2d7c0decbaca77b8e2 100644 (file)
@@ -29,8 +29,7 @@ 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_NFQ_info *tinfo = targinfo;
 
index cab881d4424ca59d01f0fd9428527fd37ea7f7c4..6d00dcaed2385b4dfddbcab61b37bef2a90d59ea 100644 (file)
@@ -16,8 +16,7 @@ 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)
 {
        /* Previously seen (loopback)? Ignore. */
        if ((*pskb)->nfct != NULL)
index 4300988786c9c3eb8554e8655714567e7b4a1243..8a04dcf2611e06f7dae1c882ba459e6486c0deb0 100644 (file)
@@ -31,7 +31,7 @@ static u8 mode;
 static unsigned int 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)
+                          const void *targinfo)
 {
        u32 secmark = 0;
        const struct xt_secmark_target_info *info = targinfo;
index 2d49948d3c38773a3fe5ccd39ba8f80538b542c0..d725e8b845031ce761f36cc9e787dcd2aa43c5d5 100644 (file)
@@ -143,7 +143,7 @@ static int check(const char *tablename,
        return 1;
 }
 
-static struct xt_match xt_connbytes_match = {
+static struct xt_match xt_connbytes_match[] = {
        {
                .name           = "connbytes",
                .family         = AF_INET,
index 224c078a398e77872418721cc206a6c01035ef9e..45a3143b862999942c72e14ae60e2765105c922e 100644 (file)
@@ -222,7 +222,7 @@ static int tcf_ipt(struct sk_buff *skb, struct tc_action *a,
        ret = ipt->tcfi_t->u.kernel.target->target(&skb, skb->dev, NULL,
                                                   ipt->tcfi_hook,
                                                   ipt->tcfi_t->u.kernel.target,
-                                                  ipt->tcfi_t->data, NULL);
+                                                  ipt->tcfi_t->data);
        switch (ret) {
        case NF_ACCEPT:
                result = TC_ACT_OK;