diff options
| author |   Stanislaw Gruszka <sgruszka@redhat.com> | 2012-12-03 12:59:04 +0100 |
|---|---|---|
| committer |   Johannes Berg <johannes.berg@intel.com> | 2012-12-05 09:57:19 +0100 |
| commit | ab9d6e4ffe192427ce9e93d4f927b0faaa8a941e (patch) | |
| tree | 261c4999fc12f5d945459c45a959933e31446708 /drivers/net/wireless/rt2x00/rt2800lib.c | |
| parent | mac80211: introduce IEEE80211_HW_TEARDOWN_AGGR_ON_BAR_FAIL (diff) | |
| download | linux-dev-ab9d6e4ffe192427ce9e93d4f927b0faaa8a941e.tar.xz linux-dev-ab9d6e4ffe192427ce9e93d4f927b0faaa8a941e.zip | |
Revert: "rt2x00: Don't let mac80211 send a BAR when an AMPDU subframe fails"
This revert:
commit be03d4a45c09ee5100d3aaaedd087f19bc20d01f
Author: Andreas Hartmann <andihartmann@01019freenet.de>
Date: Tue Apr 17 00:25:28 2012 +0200
rt2x00: Don't let mac80211 send a BAR when an AMPDU subframe fails
To fix problem workaround by above commit use
IEEE80211_HW_TEARDOWN_AGGR_ON_BAR_FAIL flag (see change log for
"mac80211: introduce IEEE80211_HW_TEARDOWN_AGGR_ON_BAR_FAIL" patch).
Resolve: https://bugzilla.kernel.org/show_bug.cgi?id=42828
Bisected-by: Francisco Pina Martins <f.pinamartins@gmail.com>
Cc: stable@vger.kernel.org
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2800lib.c')
| -rw-r--r-- | drivers/net/wireless/rt2x00/rt2800lib.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c index 3bc206d06cd1..e0002697a2b7 100644 --- a/drivers/net/wireless/rt2x00/rt2800lib.c +++ b/drivers/net/wireless/rt2x00/rt2800lib.c @@ -5090,7 +5090,8 @@ static int rt2800_probe_hw_mode(struct rt2x00_dev *rt2x00dev) IEEE80211_HW_SUPPORTS_PS | IEEE80211_HW_PS_NULLFUNC_STACK | IEEE80211_HW_AMPDU_AGGREGATION | - IEEE80211_HW_REPORTS_TX_ACK_STATUS; + IEEE80211_HW_REPORTS_TX_ACK_STATUS | + IEEE80211_HW_TEARDOWN_AGGR_ON_BAR_FAIL; /* * Don't set IEEE80211_HW_HOST_BROADCAST_PS_BUFFERING for USB devices |