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 39AE818C90A; Tue, 30 Jul 2024 16:05:10 +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=1722355511; cv=none; b=ec+68++CtL/pqLx7XUZPDdWMH+pJkG8J2eUwnViZwvrgttoUSf9ceeyaR+t3udRuOXBdoeLI8aKxWRC+XGc5TVLzddWlzd8KVUuVVBaO2PeUzmeJpXDozUO5CYgZRRlS9K0igWL4/aBqKaeHOu+locRX3rp93nr7etU66ZDNQ28= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722355511; c=relaxed/simple; bh=uIiz5Dm3lYxkj5Z0cpw9gfZ4WrwAUG/7WB1qbqHy6rk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=nh2UFpOvGYZJCKpatq0O4ocMgTIxyc7wvo4rq0D9uhIGD2OmirC+UeTZQbop7oTvqCDbl+RJrM2zeFMJkrWf9Nlp4HWwBTVF6ORXisTM0DV0peeBGbgRrXh/qsQQQ/a3hUTzzGdY7zOuT0glwCb9z/XbpIgJYZrIf+N+6mXP1KE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=BZw74ynr; 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="BZw74ynr" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 70FAEC4AF0C; Tue, 30 Jul 2024 16:05:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1722355510; bh=uIiz5Dm3lYxkj5Z0cpw9gfZ4WrwAUG/7WB1qbqHy6rk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BZw74ynrGRqPpbDWFJ96CxaK8HhKbFEOok28jdOyBVU7ubZXNh/1zGdsI2jXHI1MP qSYwPqf670B5N/VPADrs0yuLMKOGxFX8lvWZszmIdrGZQ9svRkKJxvkkfjz27/8lwv O9AutixzdYryJzOZ5tN8J1j6S5FNRqZM0L9ewkMg= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Baochen Qiang , Johannes Berg , Sasha Levin Subject: [PATCH 6.1 101/440] wifi: cfg80211: fix typo in cfg80211_calculate_bitrate_he() Date: Tue, 30 Jul 2024 17:45:34 +0200 Message-ID: <20240730151619.835540687@linuxfoundation.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240730151615.753688326@linuxfoundation.org> References: <20240730151615.753688326@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Baochen Qiang [ Upstream commit 9ee0d44f055276fe2802b2f65058e920853f4f99 ] rates_996 is mistakenly written as rates_969, fix it. Fixes: c4cbaf7973a7 ("cfg80211: Add support for HE") Signed-off-by: Baochen Qiang Link: https://msgid.link/20240606020653.33205-2-quic_bqiang@quicinc.com Signed-off-by: Johannes Berg Signed-off-by: Sasha Levin --- net/wireless/util.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/wireless/util.c b/net/wireless/util.c index 73b3648e1b4c3..37ea62f83cb56 100644 --- a/net/wireless/util.c +++ b/net/wireless/util.c @@ -1373,7 +1373,7 @@ static u32 cfg80211_calculate_bitrate_he(struct rate_info *rate) 5120, /* 0.833333... */ }; u32 rates_160M[3] = { 960777777, 907400000, 816666666 }; - u32 rates_969[3] = { 480388888, 453700000, 408333333 }; + u32 rates_996[3] = { 480388888, 453700000, 408333333 }; u32 rates_484[3] = { 229411111, 216666666, 195000000 }; u32 rates_242[3] = { 114711111, 108333333, 97500000 }; u32 rates_106[3] = { 40000000, 37777777, 34000000 }; @@ -1398,7 +1398,7 @@ static u32 cfg80211_calculate_bitrate_he(struct rate_info *rate) else if (rate->bw == RATE_INFO_BW_80 || (rate->bw == RATE_INFO_BW_HE_RU && rate->he_ru_alloc == NL80211_RATE_INFO_HE_RU_ALLOC_996)) - result = rates_969[rate->he_gi]; + result = rates_996[rate->he_gi]; else if (rate->bw == RATE_INFO_BW_40 || (rate->bw == RATE_INFO_BW_HE_RU && rate->he_ru_alloc == NL80211_RATE_INFO_HE_RU_ALLOC_484)) -- 2.43.0