From: Sean Wang <sean.wang@kernel.org>
To: nbd@nbd.name, lorenzo.bianconi@kernel.org
Cc: yu-ching.liu@mediatek.com, chengwei.yu@mediatek.com,
jacobs.wu@mediatek.com, posh.sun@mediatek.com,
clifford.hsu@mediatek.com, linux-wireless@vger.kernel.org,
linux-mediatek@lists.infradead.org,
Andrzej Ostruszka <andrzejo@google.com>
Subject: [PATCH v2 19/19] wifi: mt76: mt792x: allow three channels in the NAN combination
Date: Mon, 16 Nov 2026 17:16:30 -0600 [thread overview]
Message-ID: <20261116231630.1733906-20-sean.wang@kernel.org> (raw)
In-Reply-To: <20261116231630.1733906-1-sean.wang@kernel.org>
From: Jacobs Wu <jacobs.wu@mediatek.com>
A NAN data path schedule can use two channels, e.g. channel 6 on
2.4 GHz and channel 149 on 5 GHz, while a station interface is
connected on a third channel. The station + NAN combination only
allows two different channels, so:
- if the station is connected first, wpa_supplicant, which takes the
number of NAN schedule channels from this limit, rejects the NAN
schedule and no NDP can be set up:
NAN: No unused radio frequency available for freq 5745
- if NAN is started first, mac80211 evacuates one of the NAN channels
when the station connects.
The firmware time-shares the three channels, so allow three different
channels in this combination.
Fixes: 420e0bbd52ab ("wifi: mt76: mt792x: advertise NAN data support")
Suggested-by: Andrzej Ostruszka <andrzejo@google.com>
Signed-off-by: Jacobs Wu <jacobs.wu@mediatek.com>
---
drivers/net/wireless/mediatek/mt76/mt792x_core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/wireless/mediatek/mt76/mt792x_core.c b/drivers/net/wireless/mediatek/mt76/mt792x_core.c
index 472333ac1a62..a835c8d89618 100644
--- a/drivers/net/wireless/mediatek/mt76/mt792x_core.c
+++ b/drivers/net/wireless/mediatek/mt76/mt792x_core.c
@@ -118,7 +118,7 @@ static const struct ieee80211_iface_combination if_comb_chanctx_nan[] = {
.limits = if_limits_nan_mcc,
.n_limits = ARRAY_SIZE(if_limits_nan_mcc),
.max_interfaces = MT792x_MAX_INTERFACES,
- .num_different_channels = 2,
+ .num_different_channels = 3,
.beacon_int_infra_match = false,
},
{
--
2.43.0
prev parent reply other threads:[~2026-11-16 23:20 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-16 23:16 [PATCH v2 00/19] wifi: mt76: mt7925: add NAN security and improve NDP reliability (part 2) Sean Wang
2026-11-16 23:16 ` [PATCH v2 01/19] wifi: mt76: mt7925: add NAN low power event control on suspend/resume Sean Wang
2026-11-16 23:16 ` [PATCH v2 02/19] wifi: mt76: mt7925: implement NAN key management MCU command Sean Wang
2026-11-16 23:16 ` [PATCH v2 03/19] wifi: mt76: mt7925: add per-peer RX IGTK/BIGTK and RX GTK WTBLs Sean Wang
2026-11-16 23:16 ` [PATCH v2 04/19] wifi: mt76: mt7925: implement mt7925_nan_set_key for NAN security Sean Wang
2026-11-16 23:16 ` [PATCH v2 05/19] wifi: mt76: mt7925: install NAN BIP keys standalone in sta_key_tlv Sean Wang
2026-11-16 23:16 ` [PATCH v2 06/19] wifi: mt76: mt7925: do not disable RX NAPI twice on unload Sean Wang
2026-11-16 23:16 ` [PATCH v2 07/19] wifi: mt76: mt7925: assign the interface WTBL to the NAN management TXQ Sean Wang
2026-11-16 23:16 ` [PATCH v2 08/19] wifi: mt76: mt7925: do not deactivate shared NAN BSS on peer STA removal Sean Wang
2026-11-16 23:16 ` [PATCH v2 09/19] wifi: mt76: gate NAN unicast mgmt by peer availability via STA queues Sean Wang
2026-11-16 23:16 ` [PATCH v2 10/19] wifi: mt76: mt7925: hold NAN mgmt TX to the discovery window Sean Wang
2026-11-16 23:16 ` [PATCH v2 11/19] wifi: mt76: mt7925: double the retry budget for NAN unicast management Sean Wang
2026-11-16 23:16 ` [PATCH v2 12/19] wifi: mt76: mt7925: let TX status of DW-held NAN frames outlive the DW period Sean Wang
2026-11-16 23:16 ` [PATCH v2 13/19] wifi: mt76: mt7925: defer the NAN joined-cluster event out of NAN_START Sean Wang
2026-11-16 23:16 ` [PATCH v2 14/19] wifi: mt76: mt7925: steer NAN handshake frames by committed-bitmap state Sean Wang
2026-11-16 23:16 ` [PATCH v2 15/19] wifi: mt76: mt7925: disable only the RX NAPI instances that exist Sean Wang
2026-11-16 23:16 ` [PATCH v2 16/19] wifi: mt76: mt7925: stop queueing resets once the device is being removed Sean Wang
2026-11-16 23:16 ` [PATCH v2 17/19] wifi: mt76: mt7925: bound the lifetime of NAN unicast management frames Sean Wang
2026-11-16 23:16 ` [PATCH v2 18/19] wifi: mt76: mt7925: always deliver the joined-cluster event through the deferred work Sean Wang
2026-11-16 23:16 ` Sean Wang [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261116231630.1733906-20-sean.wang@kernel.org \
--to=sean.wang@kernel.org \
--cc=andrzejo@google.com \
--cc=chengwei.yu@mediatek.com \
--cc=clifford.hsu@mediatek.com \
--cc=jacobs.wu@mediatek.com \
--cc=linux-mediatek@lists.infradead.org \
--cc=linux-wireless@vger.kernel.org \
--cc=lorenzo.bianconi@kernel.org \
--cc=nbd@nbd.name \
--cc=posh.sun@mediatek.com \
--cc=yu-ching.liu@mediatek.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox