diff options
Diffstat (limited to 'net-dialup/fcusb2/files/fcusb2_kernel-2.6.24.diff')
-rw-r--r-- | net-dialup/fcusb2/files/fcusb2_kernel-2.6.24.diff | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/net-dialup/fcusb2/files/fcusb2_kernel-2.6.24.diff b/net-dialup/fcusb2/files/fcusb2_kernel-2.6.24.diff new file mode 100644 index 000000000000..77cdee14b0ef --- /dev/null +++ b/net-dialup/fcusb2/files/fcusb2_kernel-2.6.24.diff @@ -0,0 +1,46 @@ +--- src/driver.c.orig 2008-01-30 01:56:53.000000000 +0100 ++++ src/driver.c 2008-01-30 01:59:17.000000000 +0100 +@@ -92,8 +92,12 @@ + static DECLARE_WAIT_QUEUE_HEAD(capi_wait); + static DECLARE_WAIT_QUEUE_HEAD(tx_wait); + static DECLARE_WAIT_QUEUE_HEAD(rx_wait); ++static DECLARE_COMPLETION(hotplug); /* New DECLARE, <arnd.feldmueller@web.de> */ ++static DECLARE_COMPLETION(notify); /* New DECLARE, <arnd.feldmueller@web.de> */ ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)) + static DECLARE_MUTEX_LOCKED(hotplug); + static DECLARE_MUTEX_LOCKED(notify); ++#endif + + #define SCHED_WAKEUP_CAPI { atomic_set (&thread_capi_flag, 1); wake_up_interruptible (&capi_wait); } + #define SCHED_WAKEUP { atomic_set (&got_kicked, 1); wake_up_interruptible (&wait); } +@@ -787,7 +791,7 @@ + close_func = func; + close_data = data; + +- INIT_WORK (&closing_work, closing_worker); ++ INIT_WORK (&closing_work, (work_func_t)closing_worker); + schedule_work (&closing_work); + LOG("Worker scheduled.\n"); + } /* start_closing_worker */ +@@ -1211,7 +1215,10 @@ + } + } + LOG("Scheduler thread stopped.\n"); ++ complete(&hotplug); /* Complete Thread Sync here <arnd.feldmueller@web.de> */ ++ #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)) + up (&hotplug); ++ #endif + return 0; + } /* scheduler */ + +@@ -1246,7 +1253,10 @@ + SCHED_WAKEUP; + } + LOG("Scheduler thread signalled, waiting...\n"); ++ wait_for_completion(&hotplug); /* Wait for complete Thread Sync <arnd.feldmueller@web.de> */ ++ #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)) + down (&hotplug); ++ #endif + LOG("Scheduler thread[%d] terminated.\n", thread_pid); + } + thread_pid = -1; |