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,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 8BA30C742BC for ; Fri, 12 Jul 2019 12:40:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 577F621019 for ; Fri, 12 Jul 2019 12:40:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1562935239; bh=foU8/SdRjmkg8g68VdEPgAvGDd0f6MXFPOujEykaolc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ossy8p8LCIPsi2QbQJMDqR+ScHDlLLw86m/+m6FkvYn4WpA4B1guXmHzanPbFDg9p 1ca+L4Cr9Hky1kiY7LhTM7QgB6dE/5ie/kTevXNImbhTTeIhRETG7Cs6f2oRit0B5B 5WpKkKcR/PkRRSkjBfJVaO2wZLrz+TxgBQ+roAP4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727667AbfGLMZS (ORCPT ); Fri, 12 Jul 2019 08:25:18 -0400 Received: from mail.kernel.org ([198.145.29.99]:35000 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728244AbfGLMZO (ORCPT ); Fri, 12 Jul 2019 08:25:14 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 992AD2171F; Fri, 12 Jul 2019 12:25:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1562934314; bh=foU8/SdRjmkg8g68VdEPgAvGDd0f6MXFPOujEykaolc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=noCDBPPWXBkBB/ajvbAdlks9eXXuoeWRupleZHK2yMYqtpqo0snyM1wfnxdeqKFsH +GGuBhC18GgYKUTkyGBVZUVcdXo/18DNvnlv4hsLGVdQMmGSVwcKpThjMA0TLX+MWZ sWeV3jsjjM9SUB0AI7vhBFbQbL9XjdKMHz2+crXs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Shashidhar Lakkavalli , John Crispin , Johannes Berg , Sasha Levin Subject: [PATCH 5.1 015/138] mac80211: fix rate reporting inside cfg80211_calculate_bitrate_he() Date: Fri, 12 Jul 2019 14:17:59 +0200 Message-Id: <20190712121629.308138963@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190712121628.731888964@linuxfoundation.org> References: <20190712121628.731888964@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org [ Upstream commit 25d16d124a5e249e947c0487678b61dcff25cf8b ] The reported rate is not scaled down correctly. After applying this patch, the function will behave just like the v/ht equivalents. Signed-off-by: Shashidhar Lakkavalli Signed-off-by: John Crispin Signed-off-by: Johannes Berg Signed-off-by: Sasha Levin --- net/wireless/util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/wireless/util.c b/net/wireless/util.c index 75899b62bdc9..5a03f38788e7 100644 --- a/net/wireless/util.c +++ b/net/wireless/util.c @@ -1237,7 +1237,7 @@ static u32 cfg80211_calculate_bitrate_he(struct rate_info *rate) if (rate->he_dcm) result /= 2; - return result; + return result / 10000; } u32 cfg80211_calculate_bitrate(struct rate_info *rate) -- 2.20.1