SOURCES: eagle-usb-usb_kill_urb.patch, eagle-usb-2.6.14-rc-git-bre...

[arekm]

Author: arekm                        Date: Fri Jan 13 16:50:51 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- urb killing fixes

---- Files affected:
SOURCES:
   eagle-usb-usb_kill_urb.patch (1.3 -> 1.4) , eagle-usb-2.6.14-rc-git-breakage-fix.diff (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: SOURCES/eagle-usb-usb_kill_urb.patch
diff -u SOURCES/eagle-usb-usb_kill_urb.patch:1.3 SOURCES/eagle-usb-usb_kill_urb.patch:1.4
--- SOURCES/eagle-usb-usb_kill_urb.patch:1.3	Fri Jan 21 09:08:53 2005
+++ SOURCES/eagle-usb-usb_kill_urb.patch	Fri Jan 13 17:50:46 2006
@@ -1,55 +1,33 @@
-diff -urN eagle-usb-2.0.0.orig/driver/eu_eth.c eagle-usb-2.0.0.patch/driver/eu_eth.c
---- eagle-usb-2.0.0.orig/driver/eu_eth.c	2004-10-29 19:29:39.000000000 +0200
-+++ eagle-usb-2.0.0.patch/driver/eu_eth.c	2005-01-21 09:05:55.605326640 +0100
-@@ -34,7 +34,9 @@
- #include "eu_eth.h"
- #include "eu_sm.h"
- 
--
-+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,9)
-+#define usb_unlink_urb usb_kill_urb
-+#endif
- 
- /* --------------------- Private Functions Declaration --------------------- */
- static int eu_eth_open ( struct net_device *dev );
-diff -urN eagle-usb-2.0.0.orig/driver/eu_main.c eagle-usb-2.0.0.patch/driver/eu_main.c
---- eagle-usb-2.0.0.orig/driver/eu_main.c	2004-11-07 10:06:55.000000000 +0100
-+++ eagle-usb-2.0.0.patch/driver/eu_main.c	2005-01-21 09:06:56.187116808 +0100
-@@ -53,6 +53,10 @@
- #include "eu_eth.h"
- #include "eu_boot_sm.h"
- 
-+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,9)
-+#define usb_unlink_urb usb_kill_urb
-+#endif
-+
- /* ------------------------------- Private Macros ------------------------------- */
- 
- #define CASE_PREFIRM	EAGLE_I_PID_PREFIRM:    \
-diff -urN eagle-usb-2.0.0.orig/driver/eu_utils.c eagle-usb-2.0.0.patch/driver/eu_utils.c
---- eagle-usb-2.0.0.orig/driver/eu_utils.c	2004-11-07 10:06:55.000000000 +0100
-+++ eagle-usb-2.0.0.patch/driver/eu_utils.c	2005-01-21 09:07:36.400003520 +0100
-@@ -31,6 +31,9 @@
- #include "debug.h"
- #include "eu_firmware.h"
- 
-+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,9)
-+#define usb_unlink_urb usb_kill_urb
+diff -Nru eagle-usb-2.3.2.orig/driver/eu_eth.c eagle-usb-2.3.2/driver/eu_eth.c
+--- eagle-usb-2.3.2.orig/driver/eu_eth.c	2005-01-17 22:54:42.000000000 +0200
++++ eagle-usb-2.3.2/driver/eu_eth.c	2005-12-14 19:43:29.953273250 +0200
+@@ -495,11 +495,16 @@
+      * netif_wakequeue:
+     */
+     
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,14)
+     ins->urb_write->transfer_flags |= URB_ASYNC_UNLINK;
+     usb_unlink_urb(ins->urb_write);
+ 
+     ins->urb_oam_write->transfer_flags |= URB_ASYNC_UNLINK;
+     usb_unlink_urb(ins->urb_oam_write);
++#else
++    USB_KILL_URB(ins->urb_write);
++    USB_KILL_URB(ins->urb_oam_write);
 +#endif
- 
- /* ----------------------- Private Macros/Variables ------------------------ */
- 
-diff -urN eagle-usb-2.0.0.orig/driver/Pipes.c eagle-usb-2.0.0.patch/driver/Pipes.c
---- eagle-usb-2.0.0.orig/driver/Pipes.c	2004-10-17 22:35:55.000000000 +0200
-+++ eagle-usb-2.0.0.patch/driver/Pipes.c	2005-01-21 09:07:57.586782640 +0100
-@@ -35,6 +35,10 @@
- #include "debug.h"
- #include "eu_sm.h"
- 
-+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,9)
-+#define usb_unlink_urb usb_kill_urb
+     
+     /* We must reset the transaction time to keep the watchdog quiet: */
+     dev->trans_start = jiffies;
+diff -Nru eagle-usb-2.3.2.orig/driver/Pipes.c eagle-usb-2.3.2/driver/Pipes.c
+--- eagle-usb-2.3.2.orig/driver/Pipes.c	2005-01-17 22:54:42.000000000 +0200
++++ eagle-usb-2.3.2/driver/Pipes.c	2005-12-14 19:43:29.953273250 +0200
+@@ -919,7 +919,9 @@
+              *  -EINVAL.
+             */
+             urb->status = 0;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,14)
+             urb->transfer_flags &= ~URB_ASYNC_UNLINK;
 +#endif
-+
- /**
-  * --| Reception Mechanism:
-  *
+ 	}
+ 	else
+ 	{
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/eagle-usb-usb_kill_urb.patch?r1=1.3&r2=1.4&f=u