mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: 傅继晗 <fjhhz1997@gmail.com>
To: johannes@sipsolutions.net
Cc: linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org,
	stable@vger.kernel.org, 傅继晗 <fjhhz1997@gmail.com>
Subject: [PATCH] wifi: mac80211: fix monitor mode frame capture for real chanctx drivers
Date: Sun,  8 Mar 2026 16:45:10 +0000	[thread overview]
Message-ID: <20260308164510.5927-1-fjhhz1997@gmail.com> (raw)

Commit 0a44dfc07074 ("wifi: mac80211: simplify non-chanctx drivers")
removed the fallback path in ieee80211_monitor_start_xmit() for when
the monitor interface has no channel context assigned. This broke frame
capture and injection for drivers that implement real channel context
ops (as opposed to the ieee80211_emulate_* helpers), such as the mt76
family, when a monitor interface runs alongside another interface
(e.g. managed mode).

In that scenario the (virtual) monitor sdata does not get a chanctx of
its own, even though there is an active one from the other interface.
Before the simplification the code fell back to local->_oper_chandef;
after it, the code goes straight to fail_rcu and silently drops every
injected frame.

Commit d594cc6f2c58 ("wifi: mac80211: restore non-chanctx injection
behaviour") restored the fallback for drivers using emulate_chanctx,
but explicitly left real chanctx drivers unfixed.

Fix this by falling back to the first entry in local->chanctx_list
when the monitor vif has no chanctx and the driver uses real channel
contexts. This is analogous to how ieee80211_hw_conf_chan() already
uses the same pattern.

Tested on MT7921AU (mt76) USB adapter:
  - v6.13: managed + monitor coexistence restored (0 -> 37 frames/5s)
  - v6.19: managed + monitor coexistence restored (0 -> 39 frames/5s)
  - v7.0-rc2: managed + monitor coexistence restored (0 -> 33 frames/5s)

Cc: stable@vger.kernel.org
Fixes: 0a44dfc07074 ("wifi: mac80211: simplify non-chanctx drivers")
Link: https://github.com/morrownr/USB-WiFi/issues/682
Signed-off-by: 傅继晗 <fjhhz1997@gmail.com>
---
 net/mac80211/tx.c | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index 8cdbd41..56eaf9a 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -2396,12 +2396,28 @@ netdev_tx_t ieee80211_monitor_start_xmit(struct sk_buff *skb,
 				rcu_dereference(tmp_sdata->vif.bss_conf.chanctx_conf);
 	}
 
-	if (chanctx_conf)
+	if (chanctx_conf) {
 		chandef = &chanctx_conf->def;
-	else if (local->emulate_chanctx)
+	} else if (local->emulate_chanctx) {
 		chandef = &local->hw.conf.chandef;
-	else
-		goto fail_rcu;
+	} else {
+		/*
+		 * For real chanctx drivers (e.g. mt76), the monitor
+		 * interface may not have a chanctx assigned when running
+		 * concurrently with another interface. Fall back to any
+		 * active chanctx so that injection can still work on the
+		 * operating channel.
+		 */
+		struct ieee80211_chanctx *ctx;
+
+		ctx = list_first_entry_or_null(&local->chanctx_list,
+					       struct ieee80211_chanctx,
+					       list);
+		if (ctx)
+			chandef = &ctx->conf.def;
+		else
+			goto fail_rcu;
+	}
 
 	/*
 	 * If driver/HW supports IEEE80211_CHAN_CAN_MONITOR we still
-- 
2.43.0


             reply	other threads:[~2026-03-08 16:45 UTC|newest]

Thread overview: 43+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-03-08 16:45 傅继晗 [this message]
2026-03-09  6:53 ` Johannes Berg
2026-03-09 10:45   ` 傅继晗
2026-03-16 10:38     ` Johannes Berg
     [not found]       ` <CA+bbHrX+xby2_drzo0457raoz-kgQ6eTCCHU91pR5BkvzMiq_A@mail.gmail.com>
2026-03-19 11:40         ` Óscar Alfonso Díaz
2026-03-25  0:15           ` 傅继晗
2026-03-25 10:59             ` Óscar Alfonso Díaz
2026-03-26  1:37               ` [PATCH v2] wifi: mac80211: fix the issue of NULL pointer access when deleting the virtual interface 傅继晗
2026-03-26 12:16                 ` Óscar Alfonso Díaz
2026-03-29 21:55                   ` Óscar Alfonso Díaz
2026-04-02  0:06                     ` Óscar Alfonso Díaz
2026-04-21  8:50                       ` Óscar Alfonso Díaz
2026-04-24 12:08                         ` [PATCH] wifi: mac80211: restore monitor injection when coexisting with another VIF Brite
2026-04-24 12:17                           ` Greg KH
2026-04-24 13:55                           ` Johannes Berg
2026-04-24 14:17                             ` Óscar Alfonso Díaz
2026-04-24 17:22                             ` Brite
2026-04-25  0:34                             ` Brite
2026-04-25  1:47                           ` Lachlan Hodges
2026-04-25  2:43                             ` Brite
2026-04-26  9:25                               ` Óscar Alfonso Díaz
2026-05-18  6:38 ` [PATCH v2 0/1] wifi: mac80211: fix monitor mode frame capture for real chanctx drivers Devin Wittmayer
2026-05-18  6:40   ` [PATCH v2 1/1] " Devin Wittmayer
2026-05-18  6:42     ` Johannes Berg
2026-05-18 17:01 ` [PATCH v3 0/1] " Devin Wittmayer
2026-05-18 17:01   ` [PATCH v3] " Devin Wittmayer
2026-05-19  7:02     ` Johannes Berg
2026-05-19 23:56       ` Devin Wittmayer
2026-05-19 23:57   ` [PATCH v4 0/1] " Devin Wittmayer
2026-05-19 23:57     ` [PATCH v4] " Devin Wittmayer
2026-05-20  6:49       ` Óscar Alfonso Díaz
2026-05-20  7:42         ` Johannes Berg
2026-05-20  8:02           ` Óscar Alfonso Díaz
2026-05-20  8:58             ` Johannes Berg
2026-05-20  9:51               ` Óscar Alfonso Díaz
2026-05-20  9:53                 ` Johannes Berg
2026-05-20  9:55                   ` Óscar Alfonso Díaz
2026-06-02  8:29                     ` Óscar Alfonso Díaz
2026-06-03 11:54                       ` Óscar Alfonso Díaz
2026-06-03 12:09                         ` Johannes Berg
2026-06-03 12:10       ` Johannes Berg
2026-06-03 19:28     ` [PATCH v5 0/1] " Devin Wittmayer
2026-06-03 19:28       ` [PATCH v5 1/1] " Devin Wittmayer

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=20260308164510.5927-1-fjhhz1997@gmail.com \
    --to=fjhhz1997@gmail.com \
    --cc=johannes@sipsolutions.net \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-wireless@vger.kernel.org \
    --cc=stable@vger.kernel.org \
    /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

all inboxes | Powered by JetHome®