← 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/mac80211/pending/0098-mac80211-tasklet_enable-fix.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/mac80211/pending/0098-mac80211-tasklet_enable-fix.patch
 
1
Index: compatible/net/mac80211/ieee80211.c
 
2
===================================================================
 
3
--- compatible.orig/net/mac80211/ieee80211.c    2008-01-06 12:09:32.000000000 +0200
 
4
+++ compatible/net/mac80211/ieee80211.c 2008-01-06 12:09:32.000000000 +0200
 
5
@@ -2698,8 +2698,6 @@
 
6
 
 
7
        if (local->open_count == 0) {
 
8
                res = 0;
 
9
-               tasklet_enable(&local->tx_pending_tasklet);
 
10
-               tasklet_enable(&local->tasklet);
 
11
                if (local->ops->open)
 
12
                        res = local->ops->open(local_to_hw(local));
 
13
                if (res == 0) {
 
14
@@ -2721,6 +2719,9 @@
 
15
                                                            &conf);
 
16
                        return res;
 
17
                }
 
18
+               /* enable tasklets only if all callbacks return correctly */
 
19
+               tasklet_enable(&local->tx_pending_tasklet);
 
20
+               tasklet_enable(&local->tasklet);
 
21
        }
 
22
        local->open_count++;
 
23