From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0C4E81420C1; Fri, 29 Mar 2024 12:34:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711715646; cv=none; b=LOLdm4j5PSDyStfITWjAdMFMA4uFjyl7DoBUgIv0rr+kJBwSxMkWvhNXUUYJTRFlOpJLAwJcMefQ/6MonT0jMqMyOQMjk2XH9fNOmLSS+h+FD+z5T5AcP3ptVu+i8d6hbbhBPNpRsVqM780sM5BUDF92lrX37EcStiyxALcPGSg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711715646; c=relaxed/simple; bh=Ra4UXu1BegVD/dxe6uYDNjPmp+4p/Ri+3qwVOVWo+MA=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:Content-Type; b=qRN5flrkCUmCMqloOXg5cMgo8zPRrb+zr5uLSWEShU42Xy348A9Mf+CT63aMJfm44S7nVABTaOnBTgUmveU4ePIZzBgaaaWnxoZFsBlgE81avRZdU90y9rUnQBsNKhLIs3jI9KFbZIyWVviMWxk5XqsCag/tTZLcMtJBlPGQg/4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=QD5/JpoS; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="QD5/JpoS" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 052F4C43390; Fri, 29 Mar 2024 12:34:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711715645; bh=Ra4UXu1BegVD/dxe6uYDNjPmp+4p/Ri+3qwVOVWo+MA=; h=From:To:Cc:Subject:Date:From; b=QD5/JpoSixfx7/OUXbwfUok7ZVi7vZi9jaP3f+HaOpUXaRMvcDBc5wE8NhnakM2MT COxXabxXJAhzMvET+ARntMfBVqivVM46GL2IUrjm9afBt0+3+IPcvpedGn1Yq763Y1 T6nrFlWZd6RKg7TUv64RFgInTwWoVoqF5clZqJfLA0SQHb6cDAlG5yGdDykOaWJjcV mQvylB9VC5KP4VT5Z40aaP3lHu9or0gyuATlVICrcIc285DKeJ+MstIrCmT2Cw6PQ+ rKR32psO6NxZnoUJXRfxWbXk08kknYZ1pY1f4Z3b01b7aTkUYG8e0uxcp0W/VQiEf6 zxC8kitifTQWg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Dmitry Antipov , =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= , Kalle Valo , Sasha Levin , kvalo@kernel.org, linux-wireless@vger.kernel.org Subject: [PATCH AUTOSEL 5.10 01/17] wifi: ath9k: fix LNA selection in ath_ant_try_scan() Date: Fri, 29 Mar 2024 08:33:40 -0400 Message-ID: <20240329123405.3086155-1-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 5.10.214 Content-Transfer-Encoding: 8bit From: Dmitry Antipov [ 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 Acked-by: Toke Høiland-Jørgensen Signed-off-by: Kalle Valo Link: https://msgid.link/20231211172502.25202-1-dmantipov@yandex.ru Signed-off-by: Sasha Levin --- drivers/net/wireless/ath/ath9k/antenna.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/wireless/ath/ath9k/antenna.c b/drivers/net/wireless/ath/ath9k/antenna.c index 988222cea9dfe..acc84e6711b0e 100644 --- a/drivers/net/wireless/ath/ath9k/antenna.c +++ b/drivers/net/wireless/ath/ath9k/antenna.c @@ -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; -- 2.43.0