fix build problems

IRQ_WAKE_THREAD is not defined in kernel < 2.6.30
in include/linux/irqreturn.h .

In 09-threaded-irq.patch the condition was wrong.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

diff --git a/compat/compat-2.6.30.h b/compat/compat-2.6.30.h
index 6a7c8fb4bd5b9486073ae0fe352d23fcd2cc3571..ed31198de9e9846ccd823039ce1464b99ca56a2d 100644 (file)
--- a/compat/compat-2.6.30.h
+++ b/compat/compat-2.6.30.h
@@ -14,6 +14,8 @@
 #define TP_ARGS(args...)       TPARGS(args)
 #endif
 
+#define IRQ_WAKE_THREAD        (2)
+
 #endif /* (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)) */
 
 #endif /* LINUX_26_30_COMPAT_H */

diff --git a/compat/patches/09-threaded-irq.patch b/compat/patches/09-threaded-irq.patch
index e6daa151a14b89b2e71708c437ee06dd2c50959e..4b9a3615bd5051ac319cb8164d38ae46fc2d9e18 100644 (file)
--- a/compat/patches/09-threaded-irq.patch
+++ b/compat/patches/09-threaded-irq.patch
@@ -25,15 +25,15 @@ thread in process context as well.
                }
        } else {
 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31)
-               err = request_threaded_irq(dev->dev->irq, b43_interrupt_handler,
-                                          b43_interrupt_thread_handler,
-                                          IRQF_SHARED, KBUILD_MODNAME, dev);
-+#else
 +              err = compat_request_threaded_irq(&dev->irq_compat,
 +                                                dev->dev->irq,
 +                                                b43_interrupt_handler,
 +                                                b43_interrupt_thread_handler,
 +                                                IRQF_SHARED, KBUILD_MODNAME, dev);
++#else
+               err = request_threaded_irq(dev->dev->irq, b43_interrupt_handler,
+                                          b43_interrupt_thread_handler,
+                                          IRQF_SHARED, KBUILD_MODNAME, dev);
 +#endif
                if (err) {
                        b43err(dev->wl, "Cannot request IRQ-%d\n", dev->dev->irq);