Received: by 2002:a05:6a10:22f:0:0:0:0 with SMTP id 15csp1306786pxk; Mon, 31 Aug 2020 15:56:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzE7IGqJGYBXomgwucXC19YDoAOFoMWVb1ZQUSawIA7uOvRqhmzDxVN5+mX3XhJtAXpTwn2 X-Received: by 2002:aa7:d85a:: with SMTP id f26mr3148624eds.363.1598914576606; Mon, 31 Aug 2020 15:56:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1598914576; cv=none; d=google.com; s=arc-20160816; b=QZcNAFAIph76s63sQXbqNbZD6VwyArZxM2sVPoHIfqjMgPk1vG0VgdO1VqBIqO0x+d 6SG96WvdZb5Qt2tAeU3JPaHtrM6KtMx7FFCtb1OW3rRgN4E3YCyrRESpDnDb0L4TSL9o Mnyhf0VdgckWhfek1zyt2XtLijeP+kmMgF5RzJTFok5RwDatnBgqkO6CexoGhWw3UDK/ lyikG5VubvOwNIlcTvuCiau7732poZFSl6n2RJbbRZHv1tncsdM3rA3Kr5FWfAsmFch6 //CLOtRrhfXIV4R/k9+I0ZOGuZEB8di3b4z0xWeukacMHTYkw753egVAvzio7ZRnaosj 99zQ== 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=IjAO/jvUVL9HI/1T8UKMlZIySK/+dJwhXyXJoJXfWn9jV/CWVBS7FyT86NNYqjxVQb oyLBw8BHz7syGbTWm+qKLy1d4ymKKisqPLya2Ax0CePCn6oBWD0tqJV4Y960MLX9FGGP grZnPQ/19XutyH0xi6KLOQMY70kPZEAf84dqo89U72RUn3BHfjuP7KSFjJf4blibTTtk 1xGPEkTM/3A37hHghoBHqz+fKA8TLWb/q0O2UIs31CjUfLslmQPDxK6Lckg1ff6vDMSA QocAfkQapkJwz0DXa2751U7dTEWx65q72UiTPI1t5i+ShJfHov8Jz26gU8KYo6/L6Q9f xE6w== 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 c3si6465740edl.567.2020.08.31.15.55.52; Mon, 31 Aug 2020 15:56:16 -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 S1730170AbgHaU4n (ORCPT + 99 others); Mon, 31 Aug 2020 16:56:43 -0400 Received: from mail.adapt-ip.com ([173.164.178.19]:52392 "EHLO web.adapt-ip.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728576AbgHaU4m (ORCPT ); Mon, 31 Aug 2020 16:56:42 -0400 Received: from localhost (localhost [127.0.0.1]) by web.adapt-ip.com (Postfix) with ESMTP id D06D74F8E92; Mon, 31 Aug 2020 20:56:41 +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 3EJw9pJO-fju; Mon, 31 Aug 2020 20:56:39 +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 A93E14F8F0B; Mon, 31 Aug 2020 20:56:12 +0000 (UTC) From: Thomas Pedersen To: Johannes Berg Cc: linux-wireless , Thomas Pedersen Subject: [PATCH v2 17/22] mac80211: avoid rate init for S1G band Date: Mon, 31 Aug 2020 13:55:55 -0700 Message-Id: <20200831205600.21058-18-thomas@adapt-ip.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200831205600.21058-1-thomas@adapt-ip.com> References: <20200831205600.21058-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