← Back to branch summary

~ubuntu-branches/ubuntu/hardy/linux-backports-modules-2.6.24/hardy-security

« back to all changes in this revision

Viewing changes to updates/wireless/iwlwifi/iwlwifi/patches/03-isr.patch

  • Committer: Bazaar Package Importer
  • Author(s): , Ben Collins
  • Date: 2008-04-02 06:59:04 UTC
  • Revision ID: james.westby@ubuntu.com-20080402065904-e5knh2gn2hms3xbb
Tags: 2.6.24-14.11
https://launchpad.net/bugs/200950
https://launchpad.net/bugs/176090
[Ben Collins]

* iwlwifi: Update to iwlwifi-1.2.25 and mac80211-10.0.4
  - LP: #200950
* ubuntu: Slight cleanups to module hiearchy and Makefiles
* mac80211: Enable LED triggers
* iwlwifi: Add LED trigger support (rx and tx only)
  - LP: #176090

Show diffs side-by-side

added added

removed removed

Lines of Context:
updates/wireless/iwlwifi/iwlwifi/patches/03-isr.patch
 
1
diff -urp origin/iwl3945-base.c new/iwl3945-base.c
 
2
--- origin/iwl3945-base.c       2007-09-03 14:30:59.000000000 +0800
 
3
+++ new/iwl3945-base.c  2007-09-04 11:08:04.000000000 +0800
 
4
@@ -4851,7 +4851,11 @@ static void iwl_irq_tasklet(struct iwl_p
 
5
        spin_unlock_irqrestore(&priv->lock, flags);
 
6
 }
 
7
 
 
8
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
 
9
+static irqreturn_t iwl3945_isr(int irq, void *data, struct pt_regs *regs)
 
10
+#else
 
11
 static irqreturn_t iwl3945_isr(int irq, void *data)
 
12
+#endif
 
13
 {
 
14
        struct iwl3945_priv *priv = data;
 
15
        u32 inta, inta_mask;
 
16
diff -urp origin/iwl4965-base.c new/iwl4965-base.c
 
17
--- origin/iwl4965-base.c       2007-09-03 14:32:35.000000000 +0800
 
18
+++ new/iwl4965-base.c  2007-09-04 11:08:04.000000000 +0800
 
19
@@ -5134,7 +5134,11 @@ static void iwl_irq_tasklet(struct iwl_p
 
20
        spin_unlock_irqrestore(&priv->lock, flags);
 
21
 }
 
22
 
 
23
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
 
24
+static irqreturn_t iwl4965_isr(int irq, void *data, struct pt_regs *regs)
 
25
+#else
 
26
 static irqreturn_t iwl4965_isr(int irq, void *data)
 
27
+#endif
 
28
 {
 
29
        struct iwl4965_priv *priv = data;
 
30
        u32 inta, inta_mask;