SOURCES (LINUX_2_6): linux-2.6.19-imq1.diff - iptables/iptables6 a...

[mguevara]

Author: mguevara                     Date: Fri Dec 22 02:16:35 2006 GMT
Module: SOURCES                       Tag: LINUX_2_6
---- Log message:
- iptables/iptables6 api change 

---- Files affected:
SOURCES:
   linux-2.6.19-imq1.diff (1.1.2.1 -> 1.1.2.2) 

---- Diffs:

================================================================
Index: SOURCES/linux-2.6.19-imq1.diff
diff -u SOURCES/linux-2.6.19-imq1.diff:1.1.2.1 SOURCES/linux-2.6.19-imq1.diff:1.1.2.2
--- SOURCES/linux-2.6.19-imq1.diff:1.1.2.1	Fri Dec 22 01:51:21 2006
+++ SOURCES/linux-2.6.19-imq1.diff	Fri Dec 22 03:16:30 2006
@@ -675,8 +675,8 @@
 +                              const struct net_device *out,
 +                              unsigned int hooknum,
 +                              const struct xt_target *target,
-+                              const void *targinfo,
-+                              void *userdata)
++                              const void *targinfo
++                              )
 +{
 +       struct ipt_imq_info *mr = (struct ipt_imq_info*)targinfo;
 +
@@ -689,15 +689,15 @@
 +                         const void *e,
 +                         const struct xt_target *target,
 +                         void *targinfo,
-+                         unsigned int targinfosize,
++                         
 +                         unsigned int hook_mask)
 +{
 +       struct ipt_imq_info *mr;
 +
-+       if (targinfosize != IPT_ALIGN(sizeof(struct ipt_imq_info))) {
++       /* if (targinfosize != IPT_ALIGN(sizeof(struct ipt_imq_info))) {
 +               printk(KERN_WARNING "IMQ: invalid targinfosize\n");
 +               return 0;
-+       }
++       } */
 +       mr = (struct ipt_imq_info*)targinfo;
 +
 +       if (strcmp(tablename, "mangle") != 0) {
@@ -788,11 +788,11 @@
 +#include <linux/imq.h>
 +
 +static unsigned int imq_target(struct sk_buff **pskb,
-+                              unsigned int hooknum,
 +                              const struct net_device *in,
 +                              const struct net_device *out,
-+                              const void *targinfo,
-+                              void *userdata)
++                              unsigned int hooknum,
++                              const struct xt_target *target,
++                              const void *targinfo)
 +{
 +       struct ip6t_imq_info *mr = (struct ip6t_imq_info*)targinfo;
 +
@@ -802,17 +802,17 @@
 +}
 +
 +static int imq_checkentry(const char *tablename,
-+                         const struct ip6t_entry *e,
++                         const void *e,
++			  const struct xt_target *target,
 +                         void *targinfo,
-+                         unsigned int targinfosize,
 +                         unsigned int hook_mask)
 +{
 +       struct ip6t_imq_info *mr;
 +
-+       if (targinfosize != IP6T_ALIGN(sizeof(struct ip6t_imq_info))) {
++       /* if (targinfosize != IP6T_ALIGN(sizeof(struct ip6t_imq_info))) {
 +               printk(KERN_WARNING "IMQ: invalid targinfosize\n");
 +               return 0;
-+       }
++       } */
 +       mr = (struct ip6t_imq_info*)targinfo;
 +
 +       if (strcmp(tablename, "mangle") != 0) {
@@ -834,7 +834,7 @@
 +
 +static struct ip6t_target ip6t_imq_reg = {
 +       .name           = "IMQ",
-+       .target         = imq_target,
++       .target         = imq_target,	.targetsize     = sizeof(struct ip6t_imq_info),
 +       .checkentry     = imq_checkentry,
 +       .me             = THIS_MODULE
 +};
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/linux-2.6.19-imq1.diff?r1=1.1.2.1&r2=1.1.2.2&f=u