]> git.itanic.dy.fi Git - linux-stable/commitdiff
wifi: ath9k: fix LNA selection in ath_ant_try_scan()
authorDmitry Antipov <dmantipov@yandex.ru>
Sun, 17 Dec 2023 11:29:03 +0000 (13:29 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 13 Apr 2024 11:09:56 +0000 (13:09 +0200)
[ Upstream commit d6b27eb997ef9a2aa51633b3111bc4a04748e6d3 ]

In 'ath_ant_try_scan()', (most likely) the 2nd LNA's signal
strength should be used in comparison against RSSI when
selecting first LNA as the main one. Compile tested only.

Found by Linux Verification Center (linuxtesting.org) with SVACE.

Signed-off-by: Dmitry Antipov <dmantipov@yandex.ru>
Acked-by: Toke Høiland-Jørgensen <toke@toke.dk>
Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>
Link: https://msgid.link/20231211172502.25202-1-dmantipov@yandex.ru
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/wireless/ath/ath9k/antenna.c

index 988222cea9dfe760073e0312de65206343b65e50..acc84e6711b0e10dfcab53b02e0afaa5b077c1ff 100644 (file)
@@ -643,7 +643,7 @@ static void ath_ant_try_scan(struct ath_ant_comb *antcomb,
                                conf->main_lna_conf = ATH_ANT_DIV_COMB_LNA1;
                                conf->alt_lna_conf = ATH_ANT_DIV_COMB_LNA1_PLUS_LNA2;
                        } else if (antcomb->rssi_sub >
-                                  antcomb->rssi_lna1) {
+                                  antcomb->rssi_lna2) {
                                /* set to A-B */
                                conf->main_lna_conf = ATH_ANT_DIV_COMB_LNA1;
                                conf->alt_lna_conf = ATH_ANT_DIV_COMB_LNA1_MINUS_LNA2;