From patchwork Wed Sep 23 18:50:43 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hauke Mehrtens X-Patchwork-Id: 49590 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n8NIosaC003199 for ; Wed, 23 Sep 2009 18:50:54 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751828AbZIWSus (ORCPT ); Wed, 23 Sep 2009 14:50:48 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751834AbZIWSus (ORCPT ); Wed, 23 Sep 2009 14:50:48 -0400 Received: from server19320154104.serverpool.info ([193.201.54.104]:59555 "EHLO hauke-m.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751615AbZIWSus (ORCPT ); Wed, 23 Sep 2009 14:50:48 -0400 Received: from localhost (localhost [127.0.0.1]) by hauke-m.de (Postfix) with ESMTP id 689827E1A; Wed, 23 Sep 2009 20:50:48 +0200 (CEST) Received: from hauke-m.de ([127.0.0.1]) by localhost (hauke-m.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 4Qp4-4c6n5Kr; Wed, 23 Sep 2009 20:50:45 +0200 (CEST) Received: from localhost.localdomain (host-091-097-249-226.ewe-ip-backbone.de [91.97.249.226]) by hauke-m.de (Postfix) with ESMTPSA id 310D17E17; Wed, 23 Sep 2009 20:50:45 +0200 (CEST) From: Hauke Mehrtens To: lrodriguez@atheros.com Cc: linux-wireless@vger.kernel.org, Hauke Mehrtens Subject: [PATCH] [compat-2.6] fix build problems Date: Wed, 23 Sep 2009 20:50:43 +0200 Message-Id: <1253731843-1045-1-git-send-email-hauke@hauke-m.de> X-Mailer: git-send-email 1.6.2.1 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org 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 --- compat/compat-2.6.30.h | 2 ++ compat/patches/09-threaded-irq.patch | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/compat/compat-2.6.30.h b/compat/compat-2.6.30.h index 6a7c8fb..ed31198 100644 --- 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 e6daa15..4b9a361 100644 --- 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);