From 2b442b93396af712908f97beb5974ffcac89817a Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes@sipsolutions.net>
Date: Tue, 14 Oct 2008 16:38:55 +0200
Subject: [PATCH] --- yaml --- r: 121594 b: refs/heads/master c:
 cb121bad67a32cde37adc2729b7e18aa4fd3063e h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/net/mac80211/main.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 5163cd5f21de..caaa93d27a36 100644
--- 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
index ab8a860444af..ffff54944f9d 100644
--- 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