summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjørn Mork <bjorn@mork.no>2015-10-28 21:19:53 +0100
committerBjørn Mork <bjorn@mork.no>2015-10-28 21:19:53 +0100
commit9201a81dc227b854568661eff88d0cb6bb46ed34 (patch)
tree23a3288d5888d3984fc469048fd15d99d1146c03
parentef42b769068ebecf9166e2ffd257a93e493a477b (diff)
parent8347d81a0e96b562050c8d1e30becb8dffb50ec4 (diff)
Merge branch 'for-upstream'HEADmaster
-rw-r--r--mac80211.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/mac80211.c b/mac80211.c
index ec96f25..032e52c 100644
--- a/mac80211.c
+++ b/mac80211.c
@@ -653,6 +653,8 @@ static int mwl_mac80211_ampdu_action(struct ieee80211_hw *hw,
}
mwl_fwcmd_remove_stream(hw, stream);
+ /* re-enable A-MSDU. See below */
+ sta_info->is_amsdu_allowed = true;
}
ieee80211_stop_tx_ba_cb_irqsafe(vif, addr, tid);
@@ -668,6 +670,12 @@ static int mwl_mac80211_ampdu_action(struct ieee80211_hw *hw,
if (!rc) {
stream->state = AMPDU_STREAM_ACTIVE;
+ /* Support for A-MSDU within A-MPDU is
+ * optional. Simply disable A-MSDU until we
+ * have a new API with the peer support
+ * status.
+ */
+ sta_info->is_amsdu_allowed = false;
} else {
idx = stream->idx;
spin_unlock_bh(&priv->stream_lock);