Skip to content

Commit 93382a0

Browse files
committed
mac80211: accept aggregation sessions on 6 GHz
On 6 GHz, stations don't have ht_supported set, but they can still do aggregation since they must have HE, allow that. Link: https://lore.kernel.org/r/20200528213443.776d3c891b64.Ifa099d450617b50c691832b3c4aa08959fab520a@changeid Signed-off-by: Johannes Berg <[email protected]>
1 parent f438136 commit 93382a0

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

net/mac80211/agg-rx.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* Copyright 2007, Michael Wu <[email protected]>
1010
* Copyright 2007-2010, Intel Corporation
1111
* Copyright(c) 2015-2017 Intel Deutschland GmbH
12-
* Copyright (C) 2018 Intel Corporation
12+
* Copyright (C) 2018-2020 Intel Corporation
1313
*/
1414

1515
/**
@@ -292,7 +292,8 @@ void ___ieee80211_start_rx_ba_session(struct sta_info *sta,
292292
goto end;
293293
}
294294

295-
if (!sta->sta.ht_cap.ht_supported) {
295+
if (!sta->sta.ht_cap.ht_supported &&
296+
sta->sdata->vif.bss_conf.chandef.chan->band != NL80211_BAND_6GHZ) {
296297
ht_dbg(sta->sdata,
297298
"STA %pM erroneously requests BA session on tid %d w/o QoS\n",
298299
sta->sta.addr, tid);

net/mac80211/agg-tx.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -593,7 +593,8 @@ int ieee80211_start_tx_ba_session(struct ieee80211_sta *pubsta, u16 tid,
593593
"Requested to start BA session on reserved tid=%d", tid))
594594
return -EINVAL;
595595

596-
if (!pubsta->ht_cap.ht_supported)
596+
if (!pubsta->ht_cap.ht_supported &&
597+
sta->sdata->vif.bss_conf.chandef.chan->band != NL80211_BAND_6GHZ)
597598
return -EINVAL;
598599

599600
if (WARN_ON_ONCE(!local->ops->ampdu_action))

0 commit comments

Comments
 (0)