diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-01-22 14:22:01 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-01-22 14:22:01 -0500 |
| commit | cb4ec37d485b05decf4bdcd11724362c7f03606a (patch) | |
| tree | 7c7fdd6531b865536a0a2b4c600d8aed83b6be06 /drivers/net | |
| parent | 4668cce527acb3bd048c5e6c99b157a14b214671 (diff) | |
| parent | c3e5d7181afb66657393066bccce0956fab09ab3 (diff) | |
| download | op-kernel-dev-cb4ec37d485b05decf4bdcd11724362c7f03606a.zip op-kernel-dev-cb4ec37d485b05decf4bdcd11724362c7f03606a.tar.gz | |
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.c | 2 |
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 a790599..31534f7 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), |
