From patchwork Thu Sep 15 19:52:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Seiderer X-Patchwork-Id: 12977766 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 78067C32771 for ; Thu, 15 Sep 2022 19:53:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229844AbiIOTxA (ORCPT ); Thu, 15 Sep 2022 15:53:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38366 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229515AbiIOTw7 (ORCPT ); Thu, 15 Sep 2022 15:52:59 -0400 Received: from mout.gmx.net (mout.gmx.net [212.227.15.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2A628895E4; Thu, 15 Sep 2022 12:52:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1663271565; bh=ibEywUFeGjMC1iHdJne53rTsiI2aVS6FyLrY0lHBEPM=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date; b=dzHhNHvjJG4m8g+GALiIw4IIx5X1XoXjZD9jiqWHbJHIUokepFdyu8x0f0iMOr+b7 tvfoTIoS/3WoT8vel8iFrjvP+WL+YrvOfjHiHVjvPHF9/rTu+GnyB30TCYSGIpG2Q6 Nljve7Z6QeySDcictGdjL5SR66cR9IqY853EQ/Ow= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.fritz.box ([62.216.209.163]) by mail.gmx.net (mrgmx005 [212.227.17.190]) with ESMTPSA (Nemesis) id 1MEm2D-1oVx3931sx-00GM0K; Thu, 15 Sep 2022 21:52:44 +0200 From: Peter Seiderer To: linux-wireless@vger.kernel.org Cc: Johannes Berg , "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v1] wifi: mac80211: minstrel_ht: remove unused has_mrr member from struct minstrel_priv Date: Thu, 15 Sep 2022 21:52:43 +0200 Message-Id: <20220915195243.17142-1-ps.report@gmx.net> X-Mailer: git-send-email 2.37.3 MIME-Version: 1.0 X-Provags-ID: V03:K1:mqjVT6CYjUqic2ZPH1el64YRyCMQ7w1WOQx458k6wCLCibkvvIH oVoRL+soDNfiBz4HpXdE2zE6NUlVviZVrTtDsu9RS3IXE3mMKqCzOUj6ZYg7sr9pj9nfaQk 7CLQhHXkxdBuI9RjbGGqEYnMiEaFwyXYnIUe5eCp7g+dVO1iIRLwH9oRO+mcB9zMes4nPHd 5Kne2wbJavMTnkLoDA2NA== X-UI-Out-Filterresults: notjunk:1;V03:K0:I2geNFE7cy8=:Dj5dZMM58zLi6Nb9Ein4vB o2hW3RtlAc/07XUNJ01rkxCMp4Ox4GXsDpF5HrPRfIUAT4TS7wZK1bObimqw4cLOi5NrI0xlQ bCun07LozjeY5jNTLxLBwI3/T0KKSKfL2T7yL2Npmte0HKoorS/FrEi/9l9TUg5tS1x0+c3v2 FL1V2gnILAj+nm+RAjTqSxply7YO1FIXSmpCudv3o9LWEhCxggpYLUFVHYnl3gipHrf3Jf3Qx DZiNl3sTkTVSSvoy28u2Pn3NvKmXatMXjZx8zRPH84mGnTsd1oGnvzqtDRIiLmipoAVnLiFUZ q3eX/dtHCQAnIIPfsAnEuvKLnjyYRWRa2/lSIIaejASj7OtUy9ENToNu/qs2uIRuU/JC24ina rh3KcPWzvSziSc6qT8KEJhTG73djr1Ztzjt2XoPKQ/rC2JG1lQBcECpuvHOpYuVDgz9Xyr0v8 LOY92AbjEdSo/UDSeANxbyzWjjJsM5PEvE75lP8YTCFSTZhvSEDHBgJ0KMdCvuZb3dQqiz67f Whlr11Jy28QVg83p952D3wMBunHEgrEReG5O6WLegHXDQBPykasxtz4VJtOIJN9ilKyfoYKjw alZobCkfs0pr2wLBwTRjDvDJO9/nP/ZU014iALrKn7jJtpVzSRnhhynzI1Z9xfgoT+U0sicNY VpNoe8y3hFvgpc4vKeqIgkMDrkfXCdJ94G2gaT9Vep2wmdCc0Cn2a5rvVmMyb06kx6TST4nJ/ 4Wwm6OagstHLZjaYUMx08eaJsx61HdPj+yQsxVXfILncR/AhcDAeBVuJKBaggNHWyIVqCQOK+ FrtyEi36JzrDaKfAJjga8iHKb+mOBdRCkCCPkyJhYE2SLJxVRcZ9P8w6UyVEAAOU/Wi9EfIPW 1McDJqzpOr0A3qkdB6SiHm04lJXqAJ09HnJ5yM3djqcBWaKe5ob/gCboEpT/e9aSlagI1pWub 5L1mYvpAeRWZHOlbE/Vcorp0ms8SxWq+XCiYPgnIqZz5Y1x6knmq0nnqD/JU8RMzrF8F96GxE 9CncWTvOuF/sascLky9OlwyiiOZn7aucavVZcmkL3BAZdCFg4JW2jTunKJIsZmyXtcQ4zdEZW dudHbwxBn3CoG8xQC3896RaUCWYiHw9fm2FVyniO7v6rnxCqR48jQXRznxpJni+gxX2JA/2X1 bB5mi6d4VrChIzg+syrmZ2noct Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Remove unused has_mrr (has multi-rate retry capabilities) member from struct minstrel_priv (only set once in minstrel_ht_alloc, never used again). Signed-off-by: Peter Seiderer --- net/mac80211/rc80211_minstrel_ht.c | 3 --- net/mac80211/rc80211_minstrel_ht.h | 1 - 2 files changed, 4 deletions(-) diff --git a/net/mac80211/rc80211_minstrel_ht.c b/net/mac80211/rc80211_minstrel_ht.c index 24c3c055db6d..d262a6199dd5 100644 --- a/net/mac80211/rc80211_minstrel_ht.c +++ b/net/mac80211/rc80211_minstrel_ht.c @@ -1961,9 +1961,6 @@ minstrel_ht_alloc(struct ieee80211_hw *hw) /* safe default, does not necessarily have to match hw properties */ mp->max_retry = 7; - if (hw->max_rates >= 4) - mp->has_mrr = true; - mp->hw = hw; mp->update_interval = HZ / 20; diff --git a/net/mac80211/rc80211_minstrel_ht.h b/net/mac80211/rc80211_minstrel_ht.h index 1766ff0c78d3..4be0401f7721 100644 --- a/net/mac80211/rc80211_minstrel_ht.h +++ b/net/mac80211/rc80211_minstrel_ht.h @@ -74,7 +74,6 @@ struct minstrel_priv { struct ieee80211_hw *hw; - bool has_mrr; unsigned int cw_min; unsigned int cw_max; unsigned int max_retry;