p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rt2x00: rt2800lib: correctly set HT20/HT40 filter 

Simple patch to correct HT20/HT40 filter setting.
Tested with Rt3290, Rt3352 and Rt5350

Signed-off-by: Serge Vasilugin <vasilugin@yandex.ru>
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Acked-by: Stanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
This commit is contained in:
Serge Vasilugin 2017-01-16 04:08:38 +01:00 committed by Kalle Valo
parent feecb0cb46
commit e974f3acaf
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/wireless/ralink/rt2x00/rt2800.h
View File

@ -2286,6 +2286,8 @@ struct mac_iveiv_entry {
#define RFCSR30_RX_H20M FIELD8(0x04)
#define RFCSR30_RX_VCM FIELD8(0x18)
#define RFCSR30_RF_CALIBRATION FIELD8(0x80)
#define RF3322_RFCSR30_TX_H20M FIELD8(0x01)
#define RF3322_RFCSR30_RX_H20M FIELD8(0x02)
/*
* RFCSR 31:

13
drivers/net/wireless/ralink/rt2x00/rt2800lib.c
View File

@ -3220,8 +3220,17 @@ static void rt2800_config_channel(struct rt2x00_dev *rt2x00dev,
rt2x00_rf(rt2x00dev, RF5390) ||
rt2x00_rf(rt2x00dev, RF5392)) {
rt2800_rfcsr_read(rt2x00dev, 30, &rfcsr);
rt2x00_set_field8(&rfcsr, RFCSR30_TX_H20M, 0);
rt2x00_set_field8(&rfcsr, RFCSR30_RX_H20M, 0);
if (rt2x00_rf(rt2x00dev, RF3322)) {
rt2x00_set_field8(&rfcsr, RF3322_RFCSR30_TX_H20M,
conf_is_ht40(conf));
rt2x00_set_field8(&rfcsr, RF3322_RFCSR30_RX_H20M,
conf_is_ht40(conf));
} else {
rt2x00_set_field8(&rfcsr, RFCSR30_TX_H20M,
conf_is_ht40(conf));
rt2x00_set_field8(&rfcsr, RFCSR30_RX_H20M,
conf_is_ht40(conf));
}
rt2800_rfcsr_write(rt2x00dev, 30, rfcsr);
rt2800_rfcsr_read(rt2x00dev, 3, &rfcsr);