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 8623E13FD94; Thu, 11 Apr 2024 10:25:02 +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=1712831102; cv=none; b=jmWjpGx2OiI6K8iq+uIH3DQpuMZjWyPGirvQj8RVY/1lypjD9fpfOR6BHDpXX+68Blc9ItOmJRPPg/D1xQgM/kJ9XEFvbJlIpkifkftAiUbuKFAguIvGLSx0Pnuvd4EaBRF8S8y+IB77prH5Z24bwvuL6ZYEbXxqV4pf4ZyY3kc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712831102; c=relaxed/simple; bh=5dtCZFkz/XnU+Pji79UoEGoPp3hJFBSFP91Y4rxQ7JA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=i8ab8pGBt9LnHHqOUe1eGkyrxmyQM/jvDS3i9EQI6ZbpnQrtpIFZyoDbN1rVlrBJtqejqzybu8IsBurgG+yU+b9zoLNpyOc/wr0fDa+j95zujrvZ3kd0Y1Ywgf1MXuqubUYfEZ1kOZgUlgYBQ4AZHcQaZmZZWM4ARPt73LIzQ48= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=ByqFsPWX; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="ByqFsPWX" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0C467C433F1; Thu, 11 Apr 2024 10:25:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1712831102; bh=5dtCZFkz/XnU+Pji79UoEGoPp3hJFBSFP91Y4rxQ7JA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ByqFsPWXaPzfe3jIWSqnsbJU4ZEp/aN40JfCHHlF689tXXkJ+0r/K7drMQ3fSLoYm iq5XUJH+KCkLC/DZuqDmZdhIo2lOvYcorAMEzcw46Eq+jpQcK0sDtZ7v6Xk2w6yOCo uuCemTe8u72jRaqrtdrhPNKKzDxOPNUIJNfRbIOc= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Dmitry Antipov , =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= , Kalle Valo , Sasha Levin Subject: [PATCH 6.6 001/114] wifi: ath9k: fix LNA selection in ath_ant_try_scan() Date: Thu, 11 Apr 2024 11:55:28 +0200 Message-ID: <20240411095416.902239341@linuxfoundation.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240411095416.853744210@linuxfoundation.org> References: <20240411095416.853744210@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ 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