---

yaml --- r: 121594 b: refs/heads/master c: cb121ba h: refs/heads/master v: v3
git-mirror · Oct 31, 2008 · 2b442b9 · 2b442b9
1 parent 68bbaa2
commit 2b442b9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: faf3994a9f65fd95a68bbcc03c318a427cd1e7d3
+refs/heads/master: cb121bad67a32cde37adc2729b7e18aa4fd3063e
diff --git a/trunk/net/mac80211/main.c b/trunk/net/mac80211/main.c
@@ -203,6 +203,8 @@ int ieee80211_hw_config(struct ieee80211_local *local, u32 changed)
 	int ret = 0;
 	int power;
 
+	might_sleep();
+
 	if (local->sw_scanning)
 		chan = local->scan_channel;
 	else