SOURCES (LINUX_2_6): linux-2.6.13-imq2.diff - ported to 2.6.14.

[pluto]

Author: pluto                        Date: Mon Oct  3 20:18:56 2005 GMT
Module: SOURCES                       Tag: LINUX_2_6
---- Log message:
- ported to 2.6.14.

---- Files affected:
SOURCES:
   linux-2.6.13-imq2.diff (1.1.2.5 -> 1.1.2.6) 

---- Diffs:

================================================================
Index: SOURCES/linux-2.6.13-imq2.diff
diff -u SOURCES/linux-2.6.13-imq2.diff:1.1.2.5 SOURCES/linux-2.6.13-imq2.diff:1.1.2.6
--- SOURCES/linux-2.6.13-imq2.diff:1.1.2.5	Fri Sep 30 23:52:35 2005
+++ SOURCES/linux-2.6.13-imq2.diff	Mon Oct  3 22:18:51 2005
@@ -145,7 +145,7 @@
 diff -Nru linux-2.6.13/drivers/net/imq.c linux-2.6.13-imq/drivers/net/imq.c
 --- linux-2.6.13/drivers/net/imq.c	1970-01-01 00:00:00.000000000 +0000
 +++ linux-2.6.13-imq/drivers/net/imq.c	2005-08-29 21:02:39.000000000 +0000
-@@ -0,0 +1,387 @@
+@@ -0,0 +1,392 @@
 +/*
 + *             Pseudo-driver for the intermediate queue device.
 + *
@@ -294,7 +294,7 @@
 +       return 0;
 +}
 +
-+static int imq_nf_queue(struct sk_buff *skb, struct nf_info *info, void *data)
++static int imq_nf_queue(struct sk_buff *skb, struct nf_info *info, unsigned queue_num, void *data)
 +{
 +       struct net_device *dev;
 +       struct net_device_stats *stats;
@@ -352,6 +352,11 @@
 +       return ret;
 +}
 +
++static struct nf_queue_handler nfqh = {
++       .name	= "imq",
++       .outfn	= imq_nf_queue,
++};
++
 +static unsigned int imq_nf_hook(unsigned int hook, struct sk_buff **pskb,
 +                  const struct net_device *indev,
 +                  const struct net_device *outdev,
@@ -368,7 +373,7 @@
 +{
 +       int err;
 +
-+        err = nf_register_queue_handler(PF_INET, imq_nf_queue, NULL);
++       err = nf_register_queue_handler(PF_INET, &nfqh);
 +       if (err > 0)
 +               goto err1;
 +       if ((err = nf_register_hook(&imq_ingress_ipv4)))
@@ -376,7 +381,7 @@
 +       if ((err = nf_register_hook(&imq_egress_ipv4)))
 +               goto err3;
 +#if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE)
-+       if ((err = nf_register_queue_handler(PF_INET6, imq_nf_queue, NULL)))
++       if ((err = nf_register_queue_handler(PF_INET6, &nfqh)))
 +               goto err4;
 +       if ((err = nf_register_hook(&imq_ingress_ipv6)))
 +               goto err5;
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/linux-2.6.13-imq2.diff?r1=1.1.2.5&r2=1.1.2.6&f=u