Received: by 2002:a05:6a10:22f:0:0:0:0 with SMTP id 15csp3676457pxk; Mon, 21 Sep 2020 22:41:17 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxiCgbnt19YEijYgo9ykK6Mxcm8MRsl4VJbS4uhNCnz2LPfFghNxtZ5YALD3zPivI2ojWCl X-Received: by 2002:a17:906:9491:: with SMTP id t17mr2963902ejx.227.1600753277428; Mon, 21 Sep 2020 22:41:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1600753277; cv=none; d=google.com; s=arc-20160816; b=kaAgfkTdSW9zCPgeaLy5347VPiXM/iH7KuY24OT4Ksgq4icmSgW+3Iej0t6RMxJMgv f5FXZhmyIGCAecOTbQ355kI2ePE4AroS2fRL6ioiGS2sEqYaKW2uIapsRtmqDCnSP+TR XRtMjGWla2YaX3YbRNoGPmAWnkUeVX5yIEhGkrBQd38WPA95GVbqUrVDlZ2wd1TB/2Bq 8U7+/8+NNp8w86YOkgxfvf4ZKugNwsHh+zA2o6XGjvI50TRPlpMNnjCX2TfyBZsXwlgf oDmqu+/QZVvFcstAgyG+sdY051iQZ8Il/uh6UPh6pxVBaTC/drZB25PIODNqv1pUM7I5 7xag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=O5bae7V19Rae+U1QTswWkdSqOWXVH3Xan5mmS0/PokE=; b=ndacExMUhalEbt0mYoTdAH5zDA6TRyoT2QxrTsxwDElfBKZF5zcG1EYFBIQKmPp+RP lbVZQXc7PuqwfXtCvxRQHIhQUsXXoUBmYoYxjlx5FGZTOpqxgZ67nl1czeKO9qob+i/w qWYWTyhvRnA+OFgjsFgkLdRgM/SGxkEHj6R+rgzlEuEVGRs+VeQQPz6O88YrL1+pJQae Eu07O2AMoI51DZ1VUMgM5Hlr8XTKqPH0DEIcLD22gcKs2IRYe+qJk4xWEs9g7rBEjiLo x62Nn1eZF4DJmP/6QmlAFVVGqaJytXky1aAoSfwx7spe6KwDMWR5Kb2fRaV42enzDQ7W v+vg== 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 oz18si9722049ejb.598.2020.09.21.22.40.53; Mon, 21 Sep 2020 22:41:17 -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 S1729061AbgIVFhh (ORCPT + 99 others); Tue, 22 Sep 2020 01:37:37 -0400 Received: from mail.adapt-ip.com ([173.164.178.19]:34096 "EHLO web.adapt-ip.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729049AbgIVFhh (ORCPT ); Tue, 22 Sep 2020 01:37:37 -0400 Received: from localhost (localhost [127.0.0.1]) by web.adapt-ip.com (Postfix) with ESMTP id A4CAB4F9E12; Tue, 22 Sep 2020 05:37:36 +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 sID_dVKE6jdE; Tue, 22 Sep 2020 05:37:34 +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 06BC04F9E03; Tue, 22 Sep 2020 05:37:19 +0000 (UTC) From: Thomas Pedersen To: Johannes Berg Cc: linux-wireless , Thomas Pedersen Subject: [PATCH v4 12/17] mac80211: avoid rate init for S1G band Date: Mon, 21 Sep 2020 19:28:13 -0700 Message-Id: <20200922022818.15855-13-thomas@adapt-ip.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200922022818.15855-1-thomas@adapt-ip.com> References: <20200922022818.15855-1-thomas@adapt-ip.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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