SOURCES: kernel-desktop-imq.patch - fixes, now builds

[sparky]

Author: sparky                       Date: Sun Nov 19 02:04:18 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- fixes, now builds

---- Files affected:
SOURCES:
   kernel-desktop-imq.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/kernel-desktop-imq.patch
diff -u SOURCES/kernel-desktop-imq.patch:1.1 SOURCES/kernel-desktop-imq.patch:1.2
--- SOURCES/kernel-desktop-imq.patch:1.1	Sun Nov 19 01:47:38 2006
+++ SOURCES/kernel-desktop-imq.patch	Sun Nov 19 03:04:13 2006
@@ -349,7 +349,7 @@
 +                       ret = 0;
 +               }
 +       }
-+       if (spin_is_locked(&dev->xmit_lock))
++       if (spin_is_locked(&dev->_xmit_lock))
 +               netif_schedule(dev);
 +       else
 +
@@ -858,31 +858,3 @@
 +MODULE_AUTHOR("http://www.linuximq.net");
 +MODULE_DESCRIPTION("Pseudo-driver for the intermediate queue device. See http://www.linuximq.net/ for more information.");
 +MODULE_LICENSE("GPL");
-diff -Nru linux-2.6.17.orig/net/sched/sch_generic.c linux-2.6.17/net/sched/sch_generic.c
---- linux-2.6.17.orig/net/sched/sch_generic.c	2006-06-18 01:49:35.000000000 +0000
-+++ linux-2.6.17/net/sched/sch_generic.c	2006-09-06 20:58:51.000000000 +0000
-@@ -29,6 +29,9 @@
- #include <linux/netdevice.h>
- #include <linux/skbuff.h>
- #include <linux/rtnetlink.h>
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+#include <linux/imq.h>
-+#endif
- #include <linux/init.h>
- #include <linux/rcupdate.h>
- #include <linux/list.h>
-@@ -136,7 +139,13 @@
- 
- 			if (!netif_queue_stopped(dev)) {
- 				int ret;
--				if (netdev_nit)
-+
-+                                if (netdev_nit
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+                                  && !(skb->imq_flags & IMQ_F_ENQUEUE)
-+#endif
-+                                  )
-+
- 					dev_queue_xmit_nit(skb, dev);
- 
- 				ret = dev->hard_start_xmit(skb, dev);
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/kernel-desktop-imq.patch?r1=1.1&r2=1.2&f=u