From b4bbc758b5a0939a6a765cce3eb36e3657177bd9 Mon Sep 17 00:00:00 2001
From: Kalle Valo <kalle.valo@iki.fi>
Date: Sun, 24 Jan 2010 14:55:12 +0200
Subject: [PATCH] --- yaml --- r: 183905 b: refs/heads/master c:
 eb807fb23878bc319e029ed8ce3d835d239723a5 h: refs/heads/master i:   183903:
 c864ec11067d1baa75eb6d9044764557d028786b v: v3

---
 [refs]                          | 2 +-
 trunk/include/net/mac80211.h    | 2 +-
 trunk/net/mac80211/driver-ops.h | 2 --
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index d35e83ab0589..276aaee052a2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 96869a39399269a776a94812e9fff3d38b47d838
+refs/heads/master: eb807fb23878bc319e029ed8ce3d835d239723a5
diff --git a/trunk/include/net/mac80211.h b/trunk/include/net/mac80211.h
index f56d6f479532..f64402f6312b 100644
--- a/trunk/include/net/mac80211.h
+++ b/trunk/include/net/mac80211.h
@@ -1489,7 +1489,7 @@ enum ieee80211_ampdu_mlme_action {
  * @update_tkip_key: See the section "Hardware crypto acceleration"
  * 	This callback will be called in the context of Rx. Called for drivers
  * 	which set IEEE80211_KEY_FLAG_TKIP_REQ_RX_P1_KEY.
- *	The callback can sleep.
+ *	The callback must be atomic.
  *
  * @hw_scan: Ask the hardware to service the scan request, no need to start
  *	the scan state machine in stack. The scan must honour the channel
diff --git a/trunk/net/mac80211/driver-ops.h b/trunk/net/mac80211/driver-ops.h
index 40c6e9a89864..6c31f38ac7f5 100644
--- a/trunk/net/mac80211/driver-ops.h
+++ b/trunk/net/mac80211/driver-ops.h
@@ -144,8 +144,6 @@ static inline void drv_update_tkip_key(struct ieee80211_local *local,
 {
 	struct ieee80211_sta *ista = NULL;
 
-	might_sleep();
-
 	if (sta)
 		ista = &sta->sta;