← 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/0032-mac80211-fix-kernel-panic-during-shutdown-time.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/0032-mac80211-fix-kernel-panic-during-shutdown-time.patch
 
1
From a8f8bdd27fbac5f91aabe206f829592facb486a3 Mon Sep 17 00:00:00 2001
 
2
From: Zhu Yi <yi.zhu@intel.com>
 
3
Date: Thu, 23 Aug 2007 17:07:07 +0800
 
4
Subject: [PATCH] mac80211: fix kernel panic during shutdown time
 
5
 
 
6
Fix mac80211 kernel panic if shutdown the interface immeditely after
 
7
setup an IBSS network.
 
8
 
 
9
Signed-off-by: Zhu Yi <yi.zhu@intel.com>
 
10
---
 
11
 net/mac80211/ieee80211_sta.c |    6 ++++--
 
12
 1 files changed, 4 insertions(+), 2 deletions(-)
 
13
 
 
14
diff --git a/net/mac80211/ieee80211_sta.c b/net/mac80211/ieee80211_sta.c
 
15
index 324ace0..575ae68 100644
 
16
--- a/net/mac80211/ieee80211_sta.c
 
17
+++ b/net/mac80211/ieee80211_sta.c
 
18
@@ -4076,8 +4076,10 @@ static int ieee80211_sta_find_ibss(struct net_device *dev,
 
19
                        interval = IEEE80211_SCAN_INTERVAL_SLOW;
 
20
                }
 
21
 
 
22
-               ifsta->state = IEEE80211_IBSS_SEARCH;
 
23
-               mod_timer(&ifsta->timer, jiffies + interval);
 
24
+               if (ifsta->state != IEEE80211_DISABLED) {
 
25
+                       ifsta->state = IEEE80211_IBSS_SEARCH;
 
26
+                       mod_timer(&ifsta->timer, jiffies + interval);
 
27
+               }
 
28
                return 0;
 
29
        }
 
30
 
 
31
-- 
 
32
1.5.2
 
33