Received: by 2002:a05:6a10:6006:0:0:0:0 with SMTP id w6csp770043pxa; Thu, 27 Aug 2020 15:34:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy6CBTbY71wf9RbyZNl/MON9V3TvRdXH59KrU9p0yjN5VZ038LaiXxfmNHKrD7rTl1EGxmr X-Received: by 2002:a17:906:2e05:: with SMTP id n5mr22015154eji.397.1598567698904; Thu, 27 Aug 2020 15:34:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1598567698; cv=none; d=google.com; s=arc-20160816; b=r+dOBMrEtctZ/bjvx1np6sMD+bFOStGyMI1ieh++eRJCxtOlDybqtx754sg1L8ukAw ZBSgjbGC/ZPEYmJIHrSy/GH2bdRTo2bfJBb0GkLPUsk35HYOfsiZt2t/5sz/V07M8wZT 1Ecr5vSnsRoGbzKH9V9D/nuwN+3SvU8FzzZnbzAQnL6XDyRIKaNZmjoNxgTG7EOqglQl yApsroQtVFgSDAnTRFbH/PPF3Y0We25eOH50Y//FGkYmD/2HqggbP/dYq6RfVzUgu+m/ /ceajngcKpSiNZ5NANkDZDKi9BrB5R4g/P9LPQbUA5RC7JL7eTSYe2IGUm/pPfhopIl+ w0ZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=O5bae7V19Rae+U1QTswWkdSqOWXVH3Xan5mmS0/PokE=; b=GQf9E6hzCtpO2P54/adBL+Cjj35HblCJN54ufz6LMJksHoa6MqLhEHXnW8LzPTaAXa owY8F6bMvss09FeOPkMTKTEjU7NvAOFfKK3dTTLUOHJ4hqLcuUA34qbNlHGiXowESZg8 juioNV7uGADPfjgtHIgZiqqNP9s3f4fDv17b8h702vYXshFCBygiM9UjJqItFd9EDfEy iqyw5a2kxcZkyPGoOX+PEBPrU8PVAHVIddInUc4FXR8ivCJ50/fMlli6d3nNymA6pXwx KKm+Qi5XRtE5r/Q6mX4xNjghDa59cPoD86pLet3OdosW3PaOvKVzowElHsUmmgFzag8q UnQg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id d20si1112131edt.208.2020.08.27.15.34.35; Thu, 27 Aug 2020 15:34:58 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728051AbgH0Wdl (ORCPT + 99 others); Thu, 27 Aug 2020 18:33:41 -0400 Received: from mail.adapt-ip.com ([173.164.178.19]:50574 "EHLO web.adapt-ip.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728043AbgH0Wdi (ORCPT ); Thu, 27 Aug 2020 18:33:38 -0400 Received: from localhost (localhost [127.0.0.1]) by web.adapt-ip.com (Postfix) with ESMTP id 85F864F8204; Thu, 27 Aug 2020 22:33:38 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at web.adapt-ip.com Received: from web.adapt-ip.com ([127.0.0.1]) by localhost (web.adapt-ip.com [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id AIfg4F1VpGxZ; Thu, 27 Aug 2020 22:33:35 +0000 (UTC) Received: from atlas.campbell.adapt-ip.com (gateway.adapt-ip.com [173.164.178.20]) (Authenticated sender: thomas@adapt-ip.com) by web.adapt-ip.com (Postfix) with ESMTPSA id B556E4F8239; Thu, 27 Aug 2020 22:33:12 +0000 (UTC) From: Thomas Pedersen To: Johannes Berg Cc: linux-wireless , Thomas Pedersen Subject: [PATCH 17/22] mac80211: avoid rate init for S1G band Date: Thu, 27 Aug 2020 15:32:59 -0700 Message-Id: <20200827223304.16155-18-thomas@adapt-ip.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200827223304.16155-1-thomas@adapt-ip.com> References: <20200827223304.16155-1-thomas@adapt-ip.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org minstrel_ht is confused by the lack of sband->bitrates, and S1G will likely require a unique RC algorithm, so avoid rate init for now if STA is on the S1G band. Signed-off-by: Thomas Pedersen --- net/mac80211/rate.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/net/mac80211/rate.c b/net/mac80211/rate.c index 63266d73c252..0cba7fed28cf 100644 --- a/net/mac80211/rate.c +++ b/net/mac80211/rate.c @@ -51,6 +51,12 @@ void rate_control_rate_init(struct sta_info *sta) sband = local->hw.wiphy->bands[chanctx_conf->def.chan->band]; + /* TODO: check for minstrel_s1g ? */ + if (sband->band == NL80211_BAND_S1GHZ) { + rcu_read_unlock(); + return; + } + spin_lock_bh(&sta->rate_ctrl_lock); ref->ops->rate_init(ref->priv, sband, &chanctx_conf->def, ista, priv_sta); -- 2.20.1