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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,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 4D40FC2D0DB for ; Fri, 24 Jan 2020 10:03:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 20869208C4 for ; Fri, 24 Jan 2020 10:03:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579860188; bh=K7wja9+ppCZmKZ3AUMc5iP1LJ3dNe8J2iyH4Xa8UsNE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=aIqfBQY+QnspRRu+AOZLdhkaqctK8lW6QvjPE9BjmUTJ9kWi0bQik8KnzIdfjYsYj sXvksDAxYzzT2Kqf4vqdQGUcDWf6dNTPT/CY2Wj459ObUoIzWpsV2/TnGQQQLNQ55H EoBFWsuYtFd6J3zRlJ00PpoWHLfsI+Ta2gofRCEw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388989AbgAXKDG (ORCPT ); Fri, 24 Jan 2020 05:03:06 -0500 Received: from mail.kernel.org ([198.145.29.99]:38678 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388978AbgAXKDC (ORCPT ); Fri, 24 Jan 2020 05:03:02 -0500 Received: from localhost (unknown [145.15.244.15]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id BCCE7208C4; Fri, 24 Jan 2020 10:03:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579860182; bh=K7wja9+ppCZmKZ3AUMc5iP1LJ3dNe8J2iyH4Xa8UsNE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=F2ZfcIqgDl+dtWKT40K+u43Mp/Uh8jw3NHfqsi8E137cUObZEcGjKJzsPpCQdt+SJ W5994ve3UgAK/DKvm0wSbJ0DvLQiJ7o4v6RjsmebKO9hfy+2d6h0fmXDd8Lfc05b2p IBwqVUcbQKesvixBqMphpdeQdnT23oSBsHfjI064= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Felix Fietkau , Johannes Berg , Sasha Levin Subject: [PATCH 4.14 278/343] mac80211: minstrel_ht: fix per-group max throughput rate initialization Date: Fri, 24 Jan 2020 10:31:36 +0100 Message-Id: <20200124092956.659636649@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200124092919.490687572@linuxfoundation.org> References: <20200124092919.490687572@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 e57811e4b91f6..7ba4272642c9f 100644 --- a/net/mac80211/rc80211_minstrel_ht.c +++ b/net/mac80211/rc80211_minstrel_ht.c @@ -529,7 +529,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 (!(mi->supported[group] & BIT(i))) -- 2.20.1