SOURCES (LINUX_2_6): kernel-imq.patch - based on http://www.linuxi...

[mguevara]

Author: mguevara                     Date: Wed Nov 28 00:25:45 2007 GMT
Module: SOURCES                       Tag: LINUX_2_6
---- Log message:
- based on http://www.linuximq.net/patchs/linux-2.6.21-img2.diff
- updated to 2.6.23 - changed nf_unregister_queue_handler args
- this is replacement of linux-2.6.19-imq1.diff on LINUX_2_6 branch

---- Files affected:
SOURCES:
   kernel-imq.patch (1.1.2.1 -> 1.1.2.1.2.1) 

---- Diffs:

================================================================
Index: SOURCES/kernel-imq.patch
diff -u SOURCES/kernel-imq.patch:1.1.2.1 SOURCES/kernel-imq.patch:1.1.2.1.2.1
--- SOURCES/kernel-imq.patch:1.1.2.1	Mon Oct 29 02:21:40 2007
+++ SOURCES/kernel-imq.patch	Wed Nov 28 01:25:40 2007
@@ -407,14 +407,14 @@
 +err6:
 +	nf_unregister_hook(&imq_ingress_ipv6);
 +err5:
-+	nf_unregister_queue_handler(PF_INET6);
++	nf_unregister_queue_handler(PF_INET6, &nfqh);
 +err4:
 +	nf_unregister_hook(&imq_egress_ipv6);
 +#endif
 +err3:
 +	nf_unregister_hook(&imq_ingress_ipv4);
 +err2:
-+	nf_unregister_queue_handler(PF_INET);
++	nf_unregister_queue_handler(PF_INET, &nfqh);
 +err1:
 +	return err;
 +}
@@ -423,11 +423,11 @@
 +{
 +	nf_unregister_hook(&imq_ingress_ipv4);
 +	nf_unregister_hook(&imq_egress_ipv4);
-+	nf_unregister_queue_handler(PF_INET);
++	nf_unregister_queue_handler(PF_INET, &nfqh);
 +#if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE)
 +	nf_unregister_hook(&imq_ingress_ipv6);
 +	nf_unregister_hook(&imq_egress_ipv6);
-+	nf_unregister_queue_handler(PF_INET6);
++	nf_unregister_queue_handler(PF_INET6, &nfqh);
 +#endif
 +}
 +
@@ -813,14 +813,6 @@
 diff -Nru linux-2.6.21.1-orig/net/sched/sch_generic.c linux-2.6.21.1/net/sched/sch_generic.c
 --- linux-2.6.21.1-orig/net/sched/sch_generic.c	2007-04-27 21:49:26.000000000 +0000
 +++ linux-2.6.21.1/net/sched/sch_generic.c	2007-06-02 21:43:55.000000000 +0000
-@@ -87,7 +87,6 @@
- 
-    NOTE: Called under dev->queue_lock with locally disabled BH.
- */
--
- static inline int qdisc_restart(struct net_device *dev)
- {
- 	struct Qdisc *q = dev->qdisc;
 @@ -181,6 +180,11 @@
  	return q->q.qlen;
  }
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-imq.patch?r1=1.1.2.1&r2=1.1.2.1.2.1&f=u