summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2013-01-22 20:22:01 +0100
committerJohn W. Linville <linville@tuxdriver.com>2013-01-22 20:22:01 +0100
commitcb4ec37d485b05decf4bdcd11724362c7f03606a (patch)
tree7c7fdd6531b865536a0a2b4c600d8aed83b6be06 /drivers/net
parentath9k: disable the tasklet before taking the PCU lock (diff)
parentiwlwifi: audit single frames from AGG queue in RS (diff)
downloadlinux-cb4ec37d485b05decf4bdcd11724362c7f03606a.tar.xz
linux-cb4ec37d485b05decf4bdcd11724362c7f03606a.zip
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/wireless/iwlwifi/dvm/tx.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/dvm/tx.c b/drivers/net/wireless/iwlwifi/dvm/tx.c
index a790599fe2c2..31534f7c0548 100644
--- a/drivers/net/wireless/iwlwifi/dvm/tx.c
+++ b/drivers/net/wireless/iwlwifi/dvm/tx.c
@@ -1079,6 +1079,8 @@ static void iwlagn_set_tx_status(struct iwl_priv *priv,
{
u16 status = le16_to_cpu(tx_resp->status.status);
+ info->flags &= ~IEEE80211_TX_CTL_AMPDU;
+
info->status.rates[0].count = tx_resp->failure_frame + 1;
info->flags |= iwl_tx_status_to_mac80211(status);
iwlagn_hwrate_to_tx_control(priv, le32_to_cpu(tx_resp->rate_n_flags),