diff options
| author |   Johannes Berg <johannes.berg@intel.com> | 2010-06-10 10:21:46 +0200 |
|---|---|---|
| committer |   John W. Linville <linville@tuxdriver.com> | 2010-06-14 15:39:28 -0400 |
| commit | a93e364430de7f7a5f4eedd604ad1ab3d825dde5 (patch) | |
| tree | 441f0f69dc5b08d79c5f5f4e7adae88ad18dbd86 /net/mac80211/driver-ops.h | |
| parent | mac80211: fix RX aggregation timer (diff) | |
| download | linux-dev-a93e364430de7f7a5f4eedd604ad1ab3d825dde5.tar.xz linux-dev-a93e364430de7f7a5f4eedd604ad1ab3d825dde5.zip | |
mac80211: change RX aggregation locking
To prepare for allowing drivers to sleep in
ampdu_action, change the locking in the RX
aggregation code to use a mutex, so that it
would already allow drivers to sleep. But
explicitly disable BHs around the callback
for now since the TX part cannot yet sleep,
and drivers' locking might require it.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/driver-ops.h')
| -rw-r--r-- | net/mac80211/driver-ops.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/mac80211/driver-ops.h b/net/mac80211/driver-ops.h index 7d18a3245e3d..e5e7ef175ca2 100644 --- a/net/mac80211/driver-ops.h +++ b/net/mac80211/driver-ops.h @@ -349,9 +349,11 @@ static inline int drv_ampdu_action(struct ieee80211_local *local, u16 *ssn) { int ret = -EOPNOTSUPP; + 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; } |