[v2,21/24] mac80211: accept aggregation sessions on 6 GHz

Message ID	20200528213443.776d3c891b64.Ifa099d450617b50c691832b3c4aa08959fab520a@changeid
State	New
Headers	show Return-Path: <SRS0=UQ4x=7K=vger.kernel.org=linux-wireless-owner@kernel.org> From: Johannes Berg <johannes@sipsolutions.net> To: linux-wireless@vger.kernel.org Cc: Rajkumar Manoharan <rmanohar@codeaurora.org>, Pradeep Kumar Chitrapu <pradeepc@codeaurora.org>, Johannes Berg <johannes.berg@intel.com> Subject: [PATCH v2 21/24] mac80211: accept aggregation sessions on 6 GHz Date: Thu, 28 May 2020 21:34:44 +0200 Message-Id: <20200528213443.776d3c891b64.Ifa099d450617b50c691832b3c4aa08959fab520a@changeid> In-Reply-To: <20200528213443.993f108e96ca.I0086ae42d672379380d04ac5effb2f3d5135731b@changeid> References: <20200528213443.993f108e96ca.I0086ae42d672379380d04ac5effb2f3d5135731b@changeid> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk
Series	[v2,01/24] nl80211: really allow client-only BIGTK support \| expand [v2,01/24] nl80211: really allow client-only BIGTK support [v2,02/24] cfg80211: add a helper to identify 6 GHz PSCs [v2,03/24] ieee80211: definitions for reduced neighbor reports [v2,07/24] mac80211: add HE 6 GHz Band Capabilities into parse extension [v2,09/24] mac80211: add HE 6 GHz Band Capability element [v2,13/24] mac80211: determine chandef from HE 6 GHz operation [v2,14/24] mac80211: check the correct bit for EMA AP [v2,16/24] mac80211: Add HE 6GHz capabilities element to probe request [v2,19/24] cfg80211: require HE capabilities for 6 GHz band [v2,21/24] mac80211: accept aggregation sessions on 6 GHz [v2,22/24] mac80211: Consider 6 GHz band when handling power constraint [v2,24/24] nl80211/cfg80211: support 6 GHz scanning

Message ID

20200528213443.776d3c891b64.Ifa099d450617b50c691832b3c4aa08959fab520a@changeid

State

New

Headers

From: Johannes Berg <johannes@sipsolutions.net>
To: linux-wireless@vger.kernel.org
Cc: Rajkumar Manoharan <rmanohar@codeaurora.org>,
	Pradeep Kumar Chitrapu <pradeepc@codeaurora.org>,
	Johannes Berg <johannes.berg@intel.com>
Subject: [PATCH v2 21/24] mac80211: accept aggregation sessions on 6 GHz
Date: Thu, 28 May 2020 21:34:44 +0200
Message-Id: <20200528213443.776d3c891b64.Ifa099d450617b50c691832b3c4aa08959fab520a@changeid>
In-Reply-To: <20200528213443.993f108e96ca.I0086ae42d672379380d04ac5effb2f3d5135731b@changeid>
References: <20200528213443.993f108e96ca.I0086ae42d672379380d04ac5effb2f3d5135731b@changeid>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Sender: linux-wireless-owner@vger.kernel.org
Precedence: bulk

Series

[v2,01/24] nl80211: really allow client-only BIGTK support | expand

Commit Message

Johannes Berg May 28, 2020, 7:34 p.m. UTC

From: Johannes Berg <johannes.berg@intel.com>

On 6 GHz, stations don't have ht_supported set, but they can
still do aggregation since they must have HE, allow that.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
 net/mac80211/agg-rx.c | 5 +++--
 net/mac80211/agg-tx.c | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/net/mac80211/agg-rx.c b/net/mac80211/agg-rx.c
index 4d1c335e06e5..7f245e9f114c 100644
--- a/net/mac80211/agg-rx.c
+++ b/net/mac80211/agg-rx.c
@@ -9,7 +9,7 @@ 
  * Copyright 2007, Michael Wu <flamingice@sourmilk.net>
  * Copyright 2007-2010, Intel Corporation
  * Copyright(c) 2015-2017 Intel Deutschland GmbH
- * Copyright (C) 2018        Intel Corporation
+ * Copyright (C) 2018-2020 Intel Corporation
  */
 
 /**
@@ -292,7 +292,8 @@  void ___ieee80211_start_rx_ba_session(struct sta_info *sta,
 		goto end;
 	}
 
-	if (!sta->sta.ht_cap.ht_supported) {
+	if (!sta->sta.ht_cap.ht_supported &&
+	    sta->sdata->vif.bss_conf.chandef.chan->band != NL80211_BAND_6GHZ) {
 		ht_dbg(sta->sdata,
 		       "STA %pM erroneously requests BA session on tid %d w/o QoS\n",
 		       sta->sta.addr, tid);
diff --git a/net/mac80211/agg-tx.c b/net/mac80211/agg-tx.c
index c2d5f512526d..b37c8a983d88 100644
--- a/net/mac80211/agg-tx.c
+++ b/net/mac80211/agg-tx.c
@@ -593,7 +593,8 @@  int ieee80211_start_tx_ba_session(struct ieee80211_sta *pubsta, u16 tid,
 		 "Requested to start BA session on reserved tid=%d", tid))
 		return -EINVAL;
 
-	if (!pubsta->ht_cap.ht_supported)
+	if (!pubsta->ht_cap.ht_supported &&
+	    sta->sdata->vif.bss_conf.chandef.chan->band != NL80211_BAND_6GHZ)
 		return -EINVAL;
 
 	if (WARN_ON_ONCE(!local->ops->ampdu_action))

[v2,21/24] mac80211: accept aggregation sessions on 6 GHz

Commit Message

Patch