diff options
author | Daniel Golle <daniel@makrotopia.org> | 2019-11-03 18:31:02 +0100 |
---|---|---|
committer | Daniel Golle <daniel@makrotopia.org> | 2019-11-03 18:31:02 +0100 |
commit | 43ae50978ab0f9a7cbde6f1e9fe045dc4815cd54 (patch) | |
tree | 92d6be14e4758494209bd9bdb78a4b20621dfc84 /.gitignore | |
parent | 5f108bbc58ff1454e3ac5542dc8a64e83198c276 (diff) | |
download | upstream-43ae50978ab0f9a7cbde6f1e9fe045dc4815cd54.tar.gz upstream-43ae50978ab0f9a7cbde6f1e9fe045dc4815cd54.tar.bz2 upstream-43ae50978ab0f9a7cbde6f1e9fe045dc4815cd54.zip |
mac80211: rt2x00: remove errornous duplicate condition
https://patchwork.kernel.org/patch/11224189/
--
On 2019-10-28 06:07, wbob wrote:
> Hello Roman,
>
> while reading around drivers/net/wireless/ralink/rt2x00/rt2800lib.c
> I stumbled on what I think is an edit of yours made in error in march
> 2017:
>
> https://github.com/torvalds/linux/commit/41977e86#diff-dae5dc10da180f3b055809a48118e18aR5281
>
> RT6352 in line 5281 should not have been introduced as the "else if"
> below line 5291 can then not take effect for a RT6352 device. Another
> possibility is for line 5291 to be not for RT6352, but this seems
> very unlikely. Are you able to clarify still after this substantial time?
>
> 5277: static int rt2800_init_registers(struct rt2x00_dev *rt2x00dev)
> ...
> 5279: } else if (rt2x00_rt(rt2x00dev, RT5390) ||
> 5280: rt2x00_rt(rt2x00dev, RT5392) ||
> 5281: rt2x00_rt(rt2x00dev, RT6352)) {
> ...
> 5291: } else if (rt2x00_rt(rt2x00dev, RT6352)) {
> ...
Hence remove errornous line 5281 to make the driver actually
execute the correct initialization routine for MT7620 chips.
As it was requested by Stanislaw Gruszka remove setting values of
MIMO_PS_CFG and TX_PIN_CFG. MIMO_PS_CFG is responsible for MIMO
power-safe mode (which is disabled), hence we can drop setting it.
TX_PIN_CFG is set correctly in other functions, and as setting this
value breaks some devices, rather don't set it here during init, but
only modify it later on.
Fixes: 41977e86c984 ("rt2x00: add support for MT7620")
Reported-by: wbob <wbob@jify.de>
Reported-by: Roman Yeryomin <roman@advem.lv>
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Acked-by: Stanislaw Gruszka <sgruszka@redhat.com>
--
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions