From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 84136C33CAF for ; Thu, 16 Jan 2020 17:45:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5F8DA246A7 for ; Thu, 16 Jan 2020 17:45:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579196750; bh=GeZ9ahrBvtnGjnoLOWwGp21KkJjxM/ixIF8ZuTMK604=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ISX2vvotZy9ncohmUMYIfgYfOV1nrG2WI2u9Zoo+LerXi9uf5rgYV95LuVcJkCapt M8lf5m88JVzbtBuEzhtPIFklv7gFGvA1aBj3dNwJtCnehnv7hhxP3ojgOgJR2ozFRO SyQBKOfkId6hb4QKDh0GToMOWoPzZFqVyobGYEQ0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2406506AbgAPRpt (ORCPT ); Thu, 16 Jan 2020 12:45:49 -0500 Received: from mail.kernel.org ([198.145.29.99]:38030 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2406502AbgAPRpr (ORCPT ); Thu, 16 Jan 2020 12:45:47 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 0FC32246CC; Thu, 16 Jan 2020 17:45:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579196746; bh=GeZ9ahrBvtnGjnoLOWwGp21KkJjxM/ixIF8ZuTMK604=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BSW4BpNLLRVoyEVpGmITrkcVd14CSshEow+A5ZCkqWs+Oah6XKk9+Q9RwjGRSvREf 4XGGdjrNnjTb5eKcOFPWeUNN3e63D2AmBA146a4jsOTyfNhtxYKFKFVME9e54Su+FP FTspr9lIyORYfeOsTnWOzRwx35TNSqXRLEpakv0E= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Felix Fietkau , Johannes Berg , Sasha Levin , linux-wireless@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.4 125/174] mac80211: minstrel_ht: fix per-group max throughput rate initialization Date: Thu, 16 Jan 2020 12:42:02 -0500 Message-Id: <20200116174251.24326-125-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200116174251.24326-1-sashal@kernel.org> References: <20200116174251.24326-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Felix Fietkau [ Upstream commit 56dd918ff06e3ee24d8067e93ed12b2a39e71394 ] The group number needs to be multiplied by the number of rates per group to get the full rate index Fixes: 5935839ad735 ("mac80211: improve minstrel_ht rate sorting by throughput & probability") Signed-off-by: Felix Fietkau Link: https://lore.kernel.org/r/20190820095449.45255-1-nbd@nbd.name Signed-off-by: Johannes Berg Signed-off-by: Sasha Levin --- net/mac80211/rc80211_minstrel_ht.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/mac80211/rc80211_minstrel_ht.c b/net/mac80211/rc80211_minstrel_ht.c index ff3b28e7dbce..fb44f0107da1 100644 --- a/net/mac80211/rc80211_minstrel_ht.c +++ b/net/mac80211/rc80211_minstrel_ht.c @@ -546,7 +546,7 @@ minstrel_ht_update_stats(struct minstrel_priv *mp, struct minstrel_ht_sta *mi) /* (re)Initialize group rate indexes */ for(j = 0; j < MAX_THR_RATES; j++) - tmp_group_tp_rate[j] = group; + tmp_group_tp_rate[j] = MCS_GROUP_RATES * group; for (i = 0; i < MCS_GROUP_RATES; i++) { if (!(mg->supported & BIT(i))) -- 2.20.1