| Message ID | 1482144777-16760-2-git-send-email-sgruszka@redhat.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | a08b98196a36469700e74ec571c9fc27602de379 |
| Delegated to: | Kalle Valo |
| Headers | show |
Stanislaw Gruszka <sgruszka@redhat.com> writes: > Initalize max ampdu_factor supported by us based on rx chains, vendor > driver do the same. > > Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com> When I was applying these patches I did an off by one error with my patchwork script ('commit 2-12' vs 'commit 1-11') and accidentally applied an orinoco patch to wireless-drivers-next along with these rt2800 patches 1-10. I applied patch 11 separately and everything should be in wireless-drivers-next now (as soon as I push it). But I would appreciate if you could double check that everything is ok. Sorry for the mess. a08b98196a36 rt2800: make rx ampdu_factor depend on number of rx chains e49abb19d1bf rt2800: don't set ht parameters for non-aggregated frames a51b89698ccc rt2800: set minimum MPDU and PSDU lengths to sane values 8f03a7c6e7f9 rt2800: set MAX_PSDU len according to remote STAs capabilities 8845254112ac rt2800: rename adjust_freq_offset function bc0077053948 rt2800: warn if doing VCO recalibration for unknow RF chip 24d42ef3b152 rt2800: perform VCO recalibration for RF5592 chip d96324703ffa rt2x00: merge agc and vco works with link tuner eb79a8fe94c8 rt2800: replace mdelay by usleep on vco calibration. 31369c323ba0 rt2800: replace msleep() with usleep_range() on channel switch
diff --git a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c index 2515702..62bb9a6 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c @@ -7596,7 +7596,7 @@ static int rt2800_probe_hw_mode(struct rt2x00_dev *rt2x00dev) spec->ht.cap |= rx_chains << IEEE80211_HT_CAP_RX_STBC_SHIFT; - spec->ht.ampdu_factor = 3; + spec->ht.ampdu_factor = (rx_chains > 1) ? 3 : 2; spec->ht.ampdu_density = 4; spec->ht.mcs.tx_params = IEEE80211_HT_MCS_TX_DEFINED; if (tx_chains != rx_chains) {
Initalize max ampdu_factor supported by us based on rx chains, vendor driver do the same. Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com> --- drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)