diff options
author | John W. Linville <linville@tuxdriver.com> | 2012-12-11 16:04:03 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-12-11 16:04:03 -0500 |
commit | c66cfd5325bb215a251f4685fac8718b1da33197 (patch) | |
tree | 7c8ed5289c4a99ffcd2588ac48b5a512312a375b /drivers/net/wireless/rt2x00/rt2x00dev.c | |
parent | ecbbec2eb093d2ef205de371af986f0360fca539 (diff) | |
parent | 8acbcddb5fb3a1dc081defe51b6ac42a7ab0b398 (diff) |
Merge branch 'for-john' of git://git.sipsolutions.net/mac80211-next
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2x00dev.c')
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00dev.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c index 3248b4224c4e..4ffb6a584cd0 100644 --- a/drivers/net/wireless/rt2x00/rt2x00dev.c +++ b/drivers/net/wireless/rt2x00/rt2x00dev.c @@ -392,10 +392,9 @@ void rt2x00lib_txdone(struct queue_entry *entry, tx_info->flags |= IEEE80211_TX_STAT_AMPDU; tx_info->status.ampdu_len = 1; tx_info->status.ampdu_ack_len = success ? 1 : 0; - /* - * TODO: Need to tear down BA session here - * if not successful. - */ + + if (!success) + tx_info->flags |= IEEE80211_TX_STAT_AMPDU_NO_BACK; } if (rate_flags & IEEE80211_TX_RC_USE_RTS_CTS) { |