summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2010-06-10 10:21:49 +0200
committerJohn W. Linville <linville@tuxdriver.com>2010-06-14 21:39:28 +0200
commit85ad181ea78861f69b007599cec9e6ba33fcdf8a (patch)
treeea92b4f7aa6d09ee11ee865a11f6426e809468ba /net
parentmac80211: change TX aggregation locking (diff)
downloadlinux-85ad181ea78861f69b007599cec9e6ba33fcdf8a.tar.xz
linux-85ad181ea78861f69b007599cec9e6ba33fcdf8a.zip
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 'net')
-rw-r--r--net/mac80211/driver-ops.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/mac80211/driver-ops.h b/net/mac80211/driver-ops.h
index 7e86c6f89be9..a4fcbcc4f458 100644
--- a/net/mac80211/driver-ops.h
+++ b/net/mac80211/driver-ops.h
@@ -352,11 +352,10 @@ static inline int drv_ampdu_action(struct ieee80211_local *local,
might_sleep();
- local_bh_disable();
if (local->ops->ampdu_action)
ret = local->ops->ampdu_action(&local->hw, &sdata->vif, action,
sta, tid, ssn);
- local_bh_enable();
+
trace_drv_ampdu_action(local, sdata, action, sta, tid, ssn, ret);
return ret;
}