summaryrefslogtreecommitdiff
path: root/include/net/mac80211.h
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2010-06-10 12:21:49 +0400
committerJohn W. Linville <linville@tuxdriver.com>2010-06-14 23:39:28 +0400
commit85ad181ea78861f69b007599cec9e6ba33fcdf8a (patch)
treeea92b4f7aa6d09ee11ee865a11f6426e809468ba /include/net/mac80211.h
parentcfcdbde35e2b621cf56bedc38a3a81e8c28addb9 (diff)
downloadlinux-85ad181ea78861f69b007599cec9e6ba33fcdf8a.tar.xz
mac80211: allow drivers to sleep in ampdu_action
Allow drivers to sleep, and indicate this in the documentation. ath9k has some locking I don't understand, so keep it safe and disable BHs in it, all other drivers look fine with the context change. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'include/net/mac80211.h')
-rw-r--r--include/net/mac80211.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index 7f9401b3d3c8..bbae3d9b1176 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -1640,7 +1640,7 @@ enum ieee80211_ampdu_mlme_action {
* is the first frame we expect to perform the action on. Notice
* that TX/RX_STOP can pass NULL for this parameter.
* Returns a negative error code on failure.
- * The callback must be atomic.
+ * The callback can sleep.
*
* @get_survey: Return per-channel survey information
*